Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 26 Jan 2015 21:28:28 +0000 (13:28 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 26 Jan 2015 21:28:28 +0000 (13:28 -0800)

Trivial merge