git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1a7754 12e180a)
Merge branch 'topic/jack' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 28 Apr 2015 06:31:31 +0000 (08:31 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 28 Apr 2015 06:31:31 +0000 (08:31 +0200)
1  2 
sound/core/Makefile patch | diff1 | diff2 | blob | history
sound/pci/hda/Kconfig patch | diff1 | diff2 | blob | history
sound/pci/hda/patch_hdmi.c patch | diff1 | diff2 | blob | history

diff --cc sound/core/Makefile
Simple merge
diff --cc sound/pci/hda/Kconfig
Simple merge
diff --cc sound/pci/hda/patch_hdmi.c
Simple merge
Pandora Kernel Repository