Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 5 Dec 2008 17:40:54 +0000 (09:40 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 5 Dec 2008 17:40:54 +0000 (09:40 -0800)
Merge branches 'master' and 'linus'


Trivial merge