Merge branch 'pm-sleep'

int dpm_suspend_end(pm_message_t state)

{

	int error = dpm_suspend_late(state);

	if (error)

		return error;

	error = dpm_suspend_noirq(state);

	if (error) {

		dpm_resume_early(state);

		return error;

	}

	return error ? : dpm_suspend_noirq(state);

	return 0;

}

EXPORT_SYMBOL_GPL(dpm_suspend_end);