Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Sat, 12 Apr 2008 00:32:10 +0000 (17:32 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 12 Apr 2008 00:32:10 +0000 (17:32 -0700)
Merge branches 'master' and 'linus'


Trivial merge