Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
committerTony Lindgren <tony@atomide.com>
Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
Merge branches 'master' and 'linus'


Trivial merge