git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42d9653 f1e3f40)
Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Thu, 10 Aug 2017 15:56:43 +0000 (16:56 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 10 Aug 2017 15:56:43 +0000 (16:56 +0100)
1  2 
include/sound/soc.h patch | diff1 | diff2 | blob | history
sound/soc/soc-pcm.c patch | diff1 | diff2 | blob | history

diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/soc-pcm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.