Merge branches 'linus' and 'irq/urgent' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Fri, 16 May 2014 12:04:17 +0000 (14:04 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 16 May 2014 12:04:17 +0000 (14:04 +0200)
commit67bb90fd743ecf637f2e36eb9a39afcad08ef523
tree83e3d19d826b6287424f41635c54b0d0c0ea5756
parent9faa8321e8ff15799c684270e9b15aa294c2e676
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c
parent2ed9fd28c2884e9f41c133f86a7e377d7c0a96bf
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>
MAINTAINERS