Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:14:13 +0000 (12:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:14:13 +0000 (12:14 +1100)

Trivial merge