Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Wed, 14 Oct 2015 21:13:28 +0000 (14:13 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 14 Oct 2015 21:13:28 +0000 (14:13 -0700)

Trivial merge