Merge for-next
authorTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 02:20:13 +0000 (18:20 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 02:20:13 +0000 (18:20 -0800)

Trivial merge