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)
commiteb5bc2a213f96bd43b5f00a625acb0c669613645
tree6093a86c9e704ebfed54adb426ff3079a428da93
parent485372dc24ca2eaac18ce41a51b9dd017bc11400
parent9eccca0843205f87c00404b663188b88eb248051
Merge tag 'v4.0-rc3' into asoc-rt5670

Linux 4.0-rc3

Conflicts:
sound/soc/codecs/rt5670.c
sound/soc/codecs/rt5670.c