projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 672922e 863ebdd)
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:32 +0000 (10:43 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:32 +0000 (10:43 +0000)
1  2 
include/sound/soc-dai.h patch | diff1 | diff2 | blob | history
sound/soc/mxs/mxs-saif.c patch | diff1 | diff2 | blob | history

diff --cc include/sound/soc-dai.h
Simple merge
diff --cc sound/soc/mxs/mxs-saif.c
Simple merge
Domain: System / Kernel;