Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)
Merge branches 'master' and 'linus'


Trivial merge