Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 29 Jan 2009 17:47:57 +0000 (09:47 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 29 Jan 2009 17:47:57 +0000 (09:47 -0800)
Merge branches 'master' and 'linus'


Trivial merge