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)
commit87af0b80c933f05a4c7dd8c5edebe10365e76220
tree6c33ab1a47b5f1ef196e8847586fb81b17152a0e
parent08a978db518dfceb37998bc74a7fed03540cfd08
parent2ea3c6a2c779e5a6487d2b436770232162dfbbe3
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