Merge branch 'omap-fixes-for-tony' of git://dev.omapzoom.org/pub/scm/saaguirre/linux...
authorTony Lindgren <tony@atomide.com>
Mon, 22 Mar 2010 21:06:38 +0000 (14:06 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 22 Mar 2010 21:06:38 +0000 (14:06 -0700)

Trivial merge