diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-08 23:26:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-04-08 23:26:21 +0200 |
| commit | 462b69b1e43ceccab68a47d65b1e46520cd0fdc0 (patch) | |
| tree | 3c961fcb5889c5ab14ab36d8ef7421fc96c95959 /arch/s390/include/asm/hardirq.h | |
| parent | genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag entirely (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-462b69b1e43ceccab68a47d65b1e46520cd0fdc0.tar.xz linux-462b69b1e43ceccab68a47d65b1e46520cd0fdc0.zip | |
Merge branch 'linus' into irq/core to get the GIC updates which
conflict with pending GIC changes.
Conflicts:
drivers/usb/isp1760/isp1760-core.c
Diffstat (limited to 'arch/s390/include/asm/hardirq.h')
0 files changed, 0 insertions, 0 deletions