Merge branch 'fixes-non-critical-part2' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 21:57:55 +0000 (13:57 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 21:57:55 +0000 (13:57 -0800)
Conflicts:
arch/arm/mach-omap2/io.c


Trivial merge