]> www.infradead.org Git - users/hch/uuid.git/commitdiff
projects / users / hch / uuid.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6058868 83f7cbc)
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:10 +0000 (13:35 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:10 +0000 (13:35 +0900)
1  2 
sound/soc/codecs/Kconfig patch | diff1 | diff2 | blob | history
sound/soc/codecs/Makefile patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.