Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 30 Aug 2010 15:56:49 +0000 (08:56 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Aug 2010 15:56:49 +0000 (08:56 -0700)

Trivial merge