Merge for-next
authorTony Lindgren <tony@atomide.com>
Tue, 14 Sep 2010 04:16:58 +0000 (21:16 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 14 Sep 2010 04:16:58 +0000 (21:16 -0700)

Trivial merge