Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 7 Mar 2012 08:05:15 +0000 (09:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 7 Mar 2012 08:05:15 +0000 (09:05 +0100)
commitfc7a1627c11bb6e4eb71fd8f792109754175f7bc
tree91dc5448a151d8fb57288a7cdef26c719fe02963
parent78f8baf138311be3e170526388b0530a172bdbff
parent526af6eb4dc71302f59806e2ccac7793963a7fe0
Merge branch 'fix/hda' into topic/hda

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