Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 9 Sep 2009 20:43:58 +0000 (13:43 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 9 Sep 2009 20:43:58 +0000 (13:43 -0700)
Merge branches 'master' and 'linus'


Trivial merge