Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 31 Oct 2008 21:27:36 +0000 (14:27 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 31 Oct 2008 21:27:36 +0000 (14:27 -0700)
Merge branches 'master' and 'linus'


Trivial merge