Merge branch 'for-next' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Sat, 12 Dec 2009 00:19:16 +0000 (16:19 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 12 Dec 2009 00:19:16 +0000 (16:19 -0800)

Trivial merge