Merge branch 'master' into omap-reset
authorTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 18:54:38 +0000 (11:54 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 18:54:38 +0000 (11:54 -0700)

Trivial merge