Merge branch 'fixes-modulesplit' into fixes
authorTony Lindgren <tony@atomide.com>
Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 7 Nov 2011 20:27:23 +0000 (12:27 -0800)
1  2 
MAINTAINERS
arch/arm/plat-omap/omap_device.c

diff --cc MAINTAINERS
Simple merge
Simple merge