projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6de15b2 97f8d3b)
Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 21 May 2012 10:51:35 +0000 (12:51 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 May 2012 10:51:35 +0000 (12:51 +0200)
1  2 
sound/pci/Kconfig patch | diff1 | diff2 | blob | history
sound/pci/hda/hda_intel.c patch | diff1 | diff2 | blob | history
sound/pci/rme9652/hdsp.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/Kconfig
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/rme9652/hdsp.c
Simple merge