Merge for-next
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2010 19:43:39 +0000 (11:43 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2010 19:43:39 +0000 (11:43 -0800)

Trivial merge