From: Takashi Iwai Date: Tue, 15 Jul 2014 13:27:19 +0000 (+0200) Subject: Merge branch 'for-linus' into for-next X-Git-Tag: cleanup-for-v3.18~103^2~13^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1618e84aa87af94b46921b265b68bb7994571c20;p=pandora-kernel.git 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. --- 1618e84aa87af94b46921b265b68bb7994571c20 Reading git-diff-tree failed