diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-05-16 14:04:17 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-16 14:04:17 +0200 |
| commit | 67bb90fd743ecf637f2e36eb9a39afcad08ef523 (patch) | |
| tree | 83e3d19d826b6287424f41635c54b0d0c0ea5756 /arch/arm/mach-iop13xx | |
| parent | 9faa8321e8ff15799c684270e9b15aa294c2e676 (diff) | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| parent | 2ed9fd28c2884e9f41c133f86a7e377d7c0a96bf (diff) | |
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>