Merge for-next
authorTony Lindgren <tony@atomide.com>
Thu, 28 May 2015 18:41:37 +0000 (11:41 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 May 2015 18:41:37 +0000 (11:41 -0700)

Trivial merge