]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3223d9c 9c7da1a)
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:06 +0000 (20:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:06 +0000 (20:57 +0000)
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.