Merge branch 'linus' into core/percpu

Conflicts:
	kernel/irq/handle.c