Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 7 Jun 2010 12:08:02 +0000 (15:08 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 7 Jun 2010 12:08:02 +0000 (15:08 +0300)

Trivial merge