diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-10 10:37:02 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-10 10:37:02 +0000 |
commit | eb5bc2a213f96bd43b5f00a625acb0c669613645 (patch) | |
tree | 6093a86c9e704ebfed54adb426ff3079a428da93 /sound/soc/codecs/rt5670.h | |
parent | 485372dc24ca2eaac18ce41a51b9dd017bc11400 (diff) | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
download | op-kernel-dev-eb5bc2a213f96bd43b5f00a625acb0c669613645.zip op-kernel-dev-eb5bc2a213f96bd43b5f00a625acb0c669613645.tar.gz |
Merge tag 'v4.0-rc3' into asoc-rt5670
Linux 4.0-rc3
Conflicts:
sound/soc/codecs/rt5670.c
Diffstat (limited to 'sound/soc/codecs/rt5670.h')
0 files changed, 0 insertions, 0 deletions