Merge branch 'irq/for-block' into irq/core

Pull the irq affinity managing code which is in a seperate branch for block
developers to pull.

diff --cc drivers/irqchip/irq-mips-gic.c
Simple merge

diff --cc include/linux/irq.h
Simple merge

diff --cc include/linux/irqdomain.h
Simple merge

diff --cc kernel/irq/internals.h
Simple merge

diff --cc kernel/irq/irqdomain.c
Simple merge

diff --cc kernel/irq/manage.c
Simple merge

diff --cc kernel/irq/proc.c
Simple merge