Merge for-next
authorTony Lindgren <tony@atomide.com>
Wed, 29 Sep 2010 00:12:13 +0000 (17:12 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Sep 2010 00:12:13 +0000 (17:12 -0700)

Trivial merge