Merge branch 'omap-for-v3.8/fixes-non-critical' into omap-for-v3.8/tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 7 Nov 2012 01:28:53 +0000 (17:28 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Nov 2012 01:28:53 +0000 (17:28 -0800)

Trivial merge