Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 22 Jan 2010 02:36:51 +0000 (18:36 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Jan 2010 02:36:51 +0000 (18:36 -0800)

Trivial merge