Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 21 Feb 2008 00:06:31 +0000 (16:06 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 21 Feb 2008 00:06:31 +0000 (16:06 -0800)
Merge branches 'master' and 'linus'


Trivial merge