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


Trivial merge