Merge tag 'v4.0-rc3' into asoc-rt5670
authorMark Brown <broonie@kernel.org>
Tue, 10 Mar 2015 10:37:02 +0000 (10:37 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 10 Mar 2015 10:37:02 +0000 (10:37 +0000)
Linux 4.0-rc3

Conflicts:
sound/soc/codecs/rt5670.c

1  2 
sound/soc/codecs/rt5670.c

Simple merge