Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Sat, 18 Dec 2010 03:32:47 +0000 (19:32 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 18 Dec 2010 03:32:47 +0000 (19:32 -0800)

Trivial merge