Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
Merge branches 'master' and 'linus'


Trivial merge