Merge for-next
authorTony Lindgren <tony@atomide.com>
Tue, 2 Mar 2010 22:15:03 +0000 (14:15 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 2 Mar 2010 22:15:03 +0000 (14:15 -0800)

Trivial merge