Linux 3.0.40

Conflicts:
	kernel/power/suspend.c