Merge branch 'linus' into x86/signal

Conflicts:
	arch/x86/kernel/signal_64.c