Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
Merge branches 'master' and 'linus'


Trivial merge