Merge for-next
authorTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 00:18:00 +0000 (17:18 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 00:18:00 +0000 (17:18 -0700)

Trivial merge