Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and...
Joerg Roedel [Sun, 16 Dec 2012 11:24:09 +0000 (12:24 +0100)]
1  2  3  4  5  6 
drivers/iommu/intel-iommu.c
drivers/media/platform/omap3isp/ispccdc.c
drivers/media/platform/omap3isp/ispstat.c
drivers/media/platform/omap3isp/ispvideo.c

Simple merge