]> git.karo-electronics.de Git - linux-beck.git/commitdiff
projects / linux-beck.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 855675f 014fd22)
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
1  2 
Documentation/devicetree/bindings/sound/fsl-sai.txt patch | diff1 | diff2 | blob | history
sound/soc/fsl/fsl_sai.c patch | diff1 | diff2 | blob | history
sound/soc/fsl/fsl_sai.h patch | diff1 | diff2 | blob | history

diff --cc sound/soc/fsl/fsl_sai.c
Simple merge
diff --cc sound/soc/fsl/fsl_sai.h
Simple merge
Beck SC1x5 Kernel