]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit28f1cb12c9d0f7425523029bf735824544aa51f3
tree838029b09d5dac48768b54001fe74e476cddd344
parent5fd1088e842a94e706fc3897ef3c78224e47bdc1
parent58a4349dd53778a51f887ae26966c73890bb8800
Merge branch 'for-linus' into for-next

Yet another non-trivial conflicts for HDA legacy stuff.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c