diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 16:53:32 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 16:53:32 +0100 |
commit | a5de5b74a50113564a1e0850e2da96c37c35e55d (patch) | |
tree | 518def9fdc525e1a8331edcea06e8630b3e9910f /arch/parisc/kernel/time.c | |
parent | Merge remote-tracking branches 'asoc/topic/wm8580', 'asoc/topic/wm8753', 'aso... (diff) | |
parent | ASoC: wm9712: Remove unused DAI ID defines (diff) | |
parent | ASoC: wm9713: Remove unused DAI ID defines (diff) | |
parent | ASoC: zte: spdif: correct ZX_SPDIF_CLK_RAT define (diff) | |
download | linux-a5de5b74a50113564a1e0850e2da96c37c35e55d.tar.xz linux-a5de5b74a50113564a1e0850e2da96c37c35e55d.zip |
Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/zte' into asoc-next