Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of git://git.kernel.org/pub/scm...

author Joerg Roedel <[email protected]>

Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)

committer Joerg Roedel <[email protected]>

Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)
author Joerg Roedel <[email protected]>
Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)
committer Joerg Roedel <[email protected]>
Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)
diff --cc arch/arm/mach-omap2/devices.c
Simple merge
diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge
author	Joerg Roedel <[email protected]>
	Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)
committer	Joerg Roedel <[email protected]>
	Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)
		1	2
arch/arm/mach-omap2/devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	patch \|	diff1 \|	diff2 \|	blob \| history