projects / linux-2.6-microblaze.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fab582 51d4efa)
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sun, 5 Jan 2020 08:19:24 +0000 (09:19 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 5 Jan 2020 08:19:34 +0000 (09:19 +0100)
Merge 5.5-rc devel branch back for applying the conflicting USB-audio
fix.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
sound/pci/hda/hda_intel.c patch | diff1 | diff2 | blob | history
sound/pci/hda/patch_realtek.c patch | diff1 | diff2 | blob | history
sound/pci/ice1712/ice1724.c patch | diff1 | diff2 | blob | history
sound/usb/pcm.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
diff --cc sound/pci/ice1712/ice1724.c
Simple merge
diff --cc sound/usb/pcm.c
Simple merge
MicroBlaze GIT Repository