Merge for-next
authorTony Lindgren <tony@atomide.com>
Thu, 7 Oct 2010 00:11:08 +0000 (17:11 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 7 Oct 2010 00:11:08 +0000 (17:11 -0700)

Trivial merge