Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 17 Jun 2008 10:46:24 +0000 (13:46 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 17 Jun 2008 10:46:24 +0000 (13:46 +0300)
Merge branches 'master' and 'linus'


Trivial merge