Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and...
authorJoerg Roedel <joro@8bytes.org>
Sun, 16 Dec 2012 11:24:09 +0000 (12:24 +0100)
committerJoerg Roedel <joro@8bytes.org>
Sun, 16 Dec 2012 11:24:09 +0000 (12:24 +0100)
commit9c6ecf6a3ade2dc4b03a239af68058b22897af41
treefe8345ddac388c832f6438e7a074c3c0d1837d6f
parent29594404d7fe73cd80eaa4ee8c43dcc53970c60e
parenta0157573041403e7507a6f3f32279fc14ff5c02e
parent310aa95078443c7b7b56c60dbc55b7a11b946edb
parentea2447f700cab264019b52e2b417d689e052dcfd
parentf1bda29c2bfa84c2c022e1f443528e21607bf360
parent298ea44f211de93ce1b30dc4e2bd2d3b23e41556
Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and 'arm/omap' into next
drivers/iommu/intel-iommu.c
drivers/media/platform/omap3isp/ispccdc.c
drivers/media/platform/omap3isp/ispstat.c
drivers/media/platform/omap3isp/ispvideo.c