diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
commit | 9f61f62544747db5d5c590bfae9dd19f1337e421 (patch) | |
tree | 74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /arch/powerpc/kvm/book3s.h | |
parent | genirq: Set IRQCHIP_SKIP_SET_WAKE for no_irq_chip (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
download | linux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.xz linux-9f61f62544747db5d5c590bfae9dd19f1337e421.zip |
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'arch/powerpc/kvm/book3s.h')
0 files changed, 0 insertions, 0 deletions