Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 5 Feb 2010 04:07:37 +0000 (20:07 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 5 Feb 2010 04:07:37 +0000 (20:07 -0800)

Trivial merge