Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 10 Jun 2009 13:45:04 +0000 (16:45 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Jun 2009 13:45:04 +0000 (16:45 +0300)
Merge branches 'master' and 'linus'


Trivial merge