Linux 3.4.60

Conflicts:

	kernel/workqueue.c
merge fixes