Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Sat, 14 Feb 2009 02:38:29 +0000 (18:38 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 14 Feb 2009 02:38:29 +0000 (18:38 -0800)
Merge branches 'master' and 'linus'


Trivial merge