Merge for-next
authorTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:25:02 +0000 (18:25 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:25:02 +0000 (18:25 -0800)

Trivial merge