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


Trivial merge