]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
projects / mirror_ubuntu-artful-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 546694b 29df430)
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:05 +0000 (13:35 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:05 +0000 (13:35 +0900)
1  2 
sound/soc/fsl/Kconfig patch | diff1 | diff2 | blob | history
sound/soc/fsl/Makefile patch | diff1 | diff2 | blob | history

diff --cc sound/soc/fsl/Kconfig
Simple merge
diff --cc sound/soc/fsl/Makefile
Simple merge
Ubuntu Artful kernel mirror