projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cee429e 4c715c7 e6c111f)
Merge remote-tracking branches 'asoc/fix/pxa' and 'asoc/fix/tlv320aic3x' into asoc...
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:38 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:38 +0000 (10:39 +0100)
1  2  3 
sound/soc/codecs/tlv320aic3x.c patch | diff1 | diff2 | diff3 | blob | history
sound/soc/pxa/pxa-ssp.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc sound/soc/codecs/tlv320aic3x.c
Simple merge
diff --cc sound/soc/pxa/pxa-ssp.c
Simple merge
Domain: System / Kernel;