Merge branch 'for_3_2/omap_misc' of git://gitorious.org/omap-sw-develoment/linux...
authorTony Lindgren <tony@atomide.com>
Wed, 28 Sep 2011 21:53:59 +0000 (14:53 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 28 Sep 2011 21:53:59 +0000 (14:53 -0700)

Trivial merge