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
..
acpi	PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove	2011-10-14 09:05:31 -07:00
asm-generic	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:27:45 -07:00
crypto
drm	Revert "drm/ttm: add a way to bo_wait for either the last read or last write"	2011-10-27 18:28:37 +02:00
keys
linux	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2011-10-30 15:46:19 -07:00
math-emu
media	doc: fix broken references	2011-09-27 18:08:04 +02:00
mtd
net	Merge branch 'for-linus' of git://github.com/ericvh/linux	2011-10-26 14:20:53 +02:00
pcmcia
rdma	net: consolidate and fix ethtool_ops->get_settings calling	2011-09-15 17:32:26 -04:00
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-10-28 16:44:18 -07:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2011-10-28 14:25:01 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2011-10-28 14:25:01 -07:00
video	Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next	2011-10-15 00:19:52 +00:00
xen	Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-10-25 09:19:36 +02:00
Kbuild