Merge commit 'origin/master' into kvm-ppc-auto-next

Conflicts:
	arch/s390/include/asm/irq.h
	arch/s390/kernel/irq.c