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)
commit5405520d08b691bfa5bdad395ad72ecbc0979d3b
tree203f4e9f8b00d8adf87d4ca94c9815977981e51b
parentdcd6c92267155e70a94b3927bce681ce74b80d1f
parent4de34f3572882fd0a0e655cda494577c22663215
Merge branch 'soc-part2' into soc
arch/arm/mach-omap2/io.c