Merge for-next
authorTony Lindgren <tony@atomide.com>
Tue, 26 Jan 2010 03:48:30 +0000 (19:48 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 26 Jan 2010 03:48:30 +0000 (19:48 -0800)

Trivial merge