Merge for-next
authorTony Lindgren <tony@atomide.com>
Thu, 7 Jan 2010 01:31:24 +0000 (17:31 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 7 Jan 2010 01:31:24 +0000 (17:31 -0800)

Trivial merge