Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8996' and 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:07 +0000 (18:55 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:07 +0000 (18:55 +0100)
commit11e688862c4c8162119a4ca51c3326555966c8bb
tree8bfdf90255955696d8b687890b10daaf7852617a
parent28bedc59469e869c1ed9c30384d61798d6c3eb5c
parentd78395ce7825a74c4cbd1aebdd6cc6912d834f47
parented043aebe6ece3e13a02b6574447f150c3557378
parent67f72776b6674ca2b4602996bd3e235a4f38c4b4
Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8996' and 'asoc/topic/zx' into asoc-next
sound/soc/Makefile
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8996.c