| commit | 462b69b1e43ceccab68a47d65b1e46520cd0fdc0 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Apr 08 23:26:21 2015 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed Apr 08 23:26:21 2015 +0200 |
| tree | 3c961fcb5889c5ab14ab36d8ef7421fc96c95959 | |
| parent | d8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc [diff] | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 [diff] |
Merge branch 'linus' into irq/core to get the GIC updates which conflict with pending GIC changes. Conflicts: drivers/usb/isp1760/isp1760-core.c