Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 16 Aug 2010 06:27:51 +0000 (09:27 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 16 Aug 2010 06:27:51 +0000 (09:27 +0300)

Trivial merge