Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 20:08:01 +0000 (13:08 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 20:08:01 +0000 (13:08 -0700)

Trivial merge