Linus Torvalds 0cfdc72439 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu ... * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (33 commits) iommu/core: Remove global iommu_ops and register_iommu iommu/msm: Use bus_set_iommu instead of register_iommu iommu/omap: Use bus_set_iommu instead of register_iommu iommu/vt-d: Use bus_set_iommu instead of register_iommu iommu/amd: Use bus_set_iommu instead of register_iommu iommu/core: Use bus->iommu_ops in the iommu-api iommu/core: Convert iommu_found to iommu_present iommu/core: Add bus_type parameter to iommu_domain_alloc Driver core: Add iommu_ops to bus_type iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API iommu/amd: Fix wrong shift direction iommu/omap: always provide iommu debug code iommu/core: let drivers know if an iommu fault handler isn't installed iommu/core: export iommu_set_fault_handler() iommu/omap: Fix build error with !IOMMU_SUPPORT iommu/omap: Migrate to the generic fault report mechanism iommu/core: Add fault reporting mechanism iommu/core: Use PAGE_SIZE instead of hard-coded value iommu/core: use the existing IS_ALIGNED macro iommu/msm: ->unmap() should return order of unmapped page ... Fixup trivial conflicts in drivers/iommu/Makefile: "move omap iommu to dedicated iommu folder" vs "Rename the DMAR and INTR_REMAP config options" just happened to touch lines next to each other.		2011-10-30 15:46:19 -07:00
..
configs	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
dig	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
hp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
include/asm	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
kernel	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
kvm	iommu/core: Convert iommu_found to iommu_present	2011-10-21 14:37:20 +02:00
lib	Fix common misspellings	2011-03-31 11:26:23 -03:00
mm	mm: now that all old mmu_gather code is gone, remove the storage	2011-05-25 08:39:16 -07:00
oprofile	[IA64] fix build warning in arch/ia64/oprofile/backtrace.c	2011-04-07 11:05:56 -07:00
pci	ACPI: pci_root: pass acpi_pci_root to arch-specific scan	2010-04-04 00:29:53 -04:00
scripts	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
sn	Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 17:05:15 -07:00
uv	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
xen	sched: Provide scheduler_ipi() callback in response to smp_send_reschedule()	2011-04-14 08:52:32 +02:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	[IA64] fix "allnoconfig" build	2011-08-09 12:36:00 -07:00
Kconfig.debug
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00
module.lds