Merge branch 'soc-part2' into soc
authorTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:41:41 +0000 (05:41 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:41:41 +0000 (05:41 -0800)
1  2 
arch/arm/mach-omap2/io.c

Simple merge