Merge branch 'master' into omap7xx-upstream
authorTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 21:34:31 +0000 (14:34 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 21:34:31 +0000 (14:34 -0700)

Trivial merge