Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 8 May 2008 17:50:38 +0000 (10:50 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 8 May 2008 17:50:38 +0000 (10:50 -0700)
Merge branches 'master' and 'linus'


Trivial merge