Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
Merge branches 'master' and 'linus'


Trivial merge