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


Trivial merge