Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 31 May 2010 13:39:32 +0000 (16:39 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 31 May 2010 13:39:32 +0000 (16:39 +0300)

Trivial merge