Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Tue, 13 Oct 2015 00:14:40 +0000 (17:14 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Oct 2015 00:14:40 +0000 (17:14 -0700)

Trivial merge