Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Tue, 6 Jan 2015 23:22:17 +0000 (15:22 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Jan 2015 23:22:17 +0000 (15:22 -0800)

Trivial merge