Merge branch 'omap-for-v3.9/fixes-non-critical' into omap-for-v3.9/tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 1 Feb 2013 22:56:34 +0000 (14:56 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 1 Feb 2013 22:56:34 +0000 (14:56 -0800)

Trivial merge