Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 12 Feb 2010 21:14:54 +0000 (13:14 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 12 Feb 2010 21:14:54 +0000 (13:14 -0800)

Trivial merge