Merge branch 'omap-headers'
authorTony Lindgren <tony@atomide.com>
Wed, 7 Oct 2009 22:37:56 +0000 (15:37 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Oct 2009 22:37:56 +0000 (15:37 -0700)

Trivial merge