Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
Merge branches 'master' and 'linus'


Trivial merge