Merge branch 'fixes-non-critical' into cleanup-devices
authorTony Lindgren <tony@atomide.com>
Wed, 9 May 2012 21:32:44 +0000 (14:32 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 9 May 2012 21:32:44 +0000 (14:32 -0700)

Trivial merge