projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ceb8ef5 330345e)
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:19 +0000 (00:22 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:19 +0000 (00:22 +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.