projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97c53e2 5dc0158)
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
1  2 
include/sound/soc-dapm.h patch | diff1 | diff2 | blob | history
sound/soc/soc-dapm.c patch | diff1 | diff2 | blob | history

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