Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 15 Feb 2008 21:21:59 +0000 (13:21 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 15 Feb 2008 21:21:59 +0000 (13:21 -0800)
Merge branches 'master' and 'linus'


Trivial merge