Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2015 11:09:22 +0000 (04:09 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2015 11:09:22 +0000 (04:09 -0700)

Trivial merge