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)
Merge the recent HD-audio codec change for fixing recursive suspend
calls.

Conflicts:
sound/pci/hda/hda_codec.c


Trivial merge