Merge for-next
authorTony Lindgren <tony@atomide.com>
Tue, 2 Feb 2010 02:53:45 +0000 (18:53 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 2 Feb 2010 02:53:45 +0000 (18:53 -0800)

Trivial merge