projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf8a471 145c0e9)
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 16 Jun 2015 10:47:34 +0000 (12:47 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 16 Jun 2015 10:48:21 +0000 (12:48 +0200)
Yet another non-trivial conflicts for HDA legacy stuff.

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

diff --cc sound/pci/hda/patch_realtek.c
Simple merge