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

Trivial merge