Merge branch 'fixes-non-critical' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:45:52 +0000 (16:45 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:45:52 +0000 (16:45 -0800)
Conflicts:
arch/arm/mach-omap2/Kconfig


Trivial merge