Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2015 02:06:02 +0000 (18:06 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2015 02:06:02 +0000 (18:06 -0800)

Trivial merge