Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 26 Feb 2008 16:17:36 +0000 (08:17 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 26 Feb 2008 16:17:36 +0000 (08:17 -0800)
Merge branches 'master' and 'linus'


Trivial merge