Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 10 May 2010 22:56:06 +0000 (15:56 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 10 May 2010 22:56:06 +0000 (15:56 -0700)

Trivial merge