]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'iommu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:29:03 +0000 (14:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:29:03 +0000 (14:29 +1100)
commitb2305e1e5a2a1278280d929efd624f03b2e24f66
treee5064c29eeab91e862f4106eddf52c79cc857edf
parent43d36c51898eee6b667823828c137850385f20a2
parent624de4ae1718fe6d6e27e5620801bce0f7360e88
Merge remote-tracking branch 'iommu/next'

Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
include/linux/pci_regs.h
Documentation/kernel-parameters.txt
arch/arm/mach-omap2/devices.c
drivers/iommu/intel-iommu.c
drivers/media/video/omap3isp/ispccdc.c
drivers/media/video/omap3isp/ispstat.c
drivers/media/video/omap3isp/ispvideo.c
drivers/pci/ats.c
drivers/pci/hotplug/acpiphp_glue.c
include/linux/pci_regs.h