Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 23:38:17 +0000 (15:38 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 23:38:17 +0000 (15:38 -0800)

Trivial merge