]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 19 Nov 2012 20:25:27 +0000 (21:25 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 19 Nov 2012 20:25:27 +0000 (21:25 +0100)
commit610a108e73604eddf9b7dc622def8bd68804670e
tree6c33ab1a47b5f1ef196e8847586fb81b17152a0e
parent26785aa63b1cfe3b95267d40e7394f5ea092e91f
parent1895160c098587889cb91e05e3fca180e925eaa7
Merge branch 'for-linus' into for-next

Merge the recent HD-audio codec change for fixing recursive suspend
calls.

Conflicts:
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c