Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 15 Jul 2014 13:27:19 +0000 (15:27 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 15 Jul 2014 13:28:43 +0000 (15:28 +0200)
commit1618e84aa87af94b46921b265b68bb7994571c20
tree0ee428edbcd6e1a49abe72767850997e6adfec1c
parent03fe805a098422d27cbbbad29a54ff1349da3622
parent4da63c6fc426023d1a20e45508c47d7d68c6a53d
Merge branch 'for-linus' into for-next

Since init_failed flag was moved to struct hda_intel, its access in
the commit [4da63c6f: ALSA: hda - Fix broken PM due to incomplete
i915 initialization] is also replaced with hda->init_failed
appropriately.
sound/pci/hda/hda_controller.c
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_priv.h
sound/pci/hda/hda_tegra.c
sound/pci/hda/patch_hdmi.c