Merge branch 'fixes-modulesplit' into fixes

author Tony Lindgren <[email protected]>

Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)

committer Tony Lindgren <[email protected]>

Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)
author Tony Lindgren <[email protected]>
Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)
committer Tony Lindgren <[email protected]>
Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/plat-omap/omap_device.c
Simple merge
author	Tony Lindgren <[email protected]>
	Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)
committer	Tony Lindgren <[email protected]>
	Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/omap_device.c	patch \|	diff1 \|	diff2 \|	blob \| history