Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 10 Sep 2009 19:42:37 +0000 (12:42 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 Sep 2009 19:42:37 +0000 (12:42 -0700)
Merge branches 'master' and 'linus'


Trivial merge