Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Tue, 6 Jan 2015 00:30:34 +0000 (16:30 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Jan 2015 00:30:34 +0000 (16:30 -0800)

Trivial merge