Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2015 01:12:18 +0000 (17:12 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2015 01:12:18 +0000 (17:12 -0800)

Trivial merge