Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 19 Dec 2008 08:39:33 +0000 (10:39 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 19 Dec 2008 08:39:33 +0000 (10:39 +0200)
Merge branches 'master' and 'linus'


Trivial merge