Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap...
authorTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:46:36 +0000 (14:46 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:46:36 +0000 (14:46 -0800)
1  2 
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile

Simple merge
Simple merge