]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Fri, 2 Mar 2012 08:00:33 +0000 (09:00 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 2 Mar 2012 08:00:33 +0000 (09:00 +0100)
commitd862a9dd4f34f8ecb1cd779acba791f714c0555e
tree871da898d9953dd50c4830400ba1dd0b614ee311
parent5117c5dd54073161bf7b720d2928ed9e7aa78295
parent64493142655508eba4e83beb7fb9366fe517e6d4
Merge branch 'fix/hda' into topic/hda

Speaker-Out renames are merged.

Conflicts:
sound/pci/hda/patch_realtek.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c