Merge branch 'omap1' into ams-delta
authorTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2012 23:20:00 +0000 (15:20 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2012 23:20:00 +0000 (15:20 -0800)

Trivial merge