Merge branch 'omap-fixes-for-linus' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 17 Feb 2010 22:08:58 +0000 (14:08 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 17 Feb 2010 22:08:58 +0000 (14:08 -0800)
1  2 
arch/arm/mach-omap2/mux.c

Simple merge