Merge for-next
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 00:41:30 +0000 (17:41 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 00:41:30 +0000 (17:41 -0700)

Trivial merge