Merge branch 'omap3-upstream'
authorTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2009 17:05:24 +0000 (20:05 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2009 17:05:24 +0000 (20:05 +0300)

Trivial merge