Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 29 Jan 2010 22:20:58 +0000 (14:20 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 29 Jan 2010 22:20:58 +0000 (14:20 -0800)

Trivial merge