Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 28 Aug 2009 16:21:29 +0000 (09:21 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 28 Aug 2009 16:21:29 +0000 (09:21 -0700)
Merge branches 'master' and 'linus'


Trivial merge