Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 7 Dec 2011 16:33:09 +0000 (17:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 7 Dec 2011 16:33:09 +0000 (17:33 +0100)
commitffe7e4063987678c00589717d7871f837c6e7300
tree1aeee46780d9f7601909a4baa5f0c766c555e2e2
parent9eb6e9b16f86ef94f05427bd7fc84d521aa57169
parent0a34b42b6245ccc710be6759cded5b7fe41ea1f9
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c