Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 1 Oct 2010 23:39:30 +0000 (16:39 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 1 Oct 2010 23:39:30 +0000 (16:39 -0700)

Trivial merge