make sure to match up the beginning of the resume_noirq phase with
the end of the resume_machine phase. The suspend/resume_machine
phases are just groups of low level calls. The rest are actually
placed around dpm calls.
Merge branch 'master' into development
further experimentation on reorganizing the timelien