summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-05-16 14:04:17 +0200
committerThomas Gleixner <tglx@linutronix.de>2014-05-16 14:04:17 +0200
commit67bb90fd743ecf637f2e36eb9a39afcad08ef523 (patch)
tree83e3d19d826b6287424f41635c54b0d0c0ea5756 /arch/arm/mach-iop13xx
parentMerge tag 'irqchip-mvebu-3.16' of git://git.infradead.org/linux-mvebu into ir... (diff)
parentLinux 3.15-rc5 (diff)
parentMAINTAINERS: Add co-maintainer for drivers/irqchip (diff)
downloadlinux-67bb90fd743ecf637f2e36eb9a39afcad08ef523.tar.xz
linux-67bb90fd743ecf637f2e36eb9a39afcad08ef523.zip
Merge branches 'linus' and 'irq/urgent' into irq/core
Reason: Get the upstream and urgent fixes before applying more complex changes. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>