Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Mon, 1 Jun 2015 23:08:50 +0000 (16:08 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 1 Jun 2015 23:08:50 +0000 (16:08 -0700)

Trivial merge