]> 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)
commit943268cb2a421f61090d3375e480dfb0da8c77a2
tree838029b09d5dac48768b54001fe74e476cddd344
parentac957656cb40c087cead7e67871b2caf6fc34469
parentd7f4af7edb128bea0a049bb5c106ec60a4c3b02d
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