Linux 3.4.11
Linux 3.4.12

Conflicts:
	kernel/kthread.c