]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
projects / users / griffoul / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d03ab0 9c7da1a)
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:02 +0000 (15:10 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:02 +0000 (15:10 +0800)
1  2 
include/sound/pcm.h patch | diff1 | diff2 | blob | history
sound/soc/codecs/pcm512x.c patch | diff1 | diff2 | blob | history

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