summaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-07-15 15:27:19 +0200
committerTakashi Iwai <tiwai@suse.de>2014-07-15 15:28:43 +0200
commit1618e84aa87af94b46921b265b68bb7994571c20 (patch)
tree0ee428edbcd6e1a49abe72767850997e6adfec1c /mm/page_alloc.c
parent03fe805a098422d27cbbbad29a54ff1349da3622 (diff)
parent4da63c6fc426023d1a20e45508c47d7d68c6a53d (diff)
downloadop-kernel-dev-1618e84aa87af94b46921b265b68bb7994571c20.zip
op-kernel-dev-1618e84aa87af94b46921b265b68bb7994571c20.tar.gz
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.
Diffstat (limited to 'mm/page_alloc.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud