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

Trivial merge