Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Tue, 13 Jan 2015 21:12:08 +0000 (13:12 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Jan 2015 21:12:08 +0000 (13:12 -0800)

Trivial merge