]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'iommu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:51:35 +0000 (14:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:51:35 +0000 (14:51 +1100)
commit8a0998b0ff134d9f128ee6beb604972c2fd737e1
treee1d9a68e4c97c5709938bfd100bef98ef79046d9
parent723bf9803321377711ecc002155773418a2c364a
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/ispvideo.c
drivers/pci/ats.c
drivers/pci/hotplug/acpiphp_glue.c
include/linux/pci_regs.h