diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 12:52:12 (GMT) |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 12:52:12 (GMT) |
| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /arch/x86/xen/xen-asm_32.S | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
| download | linux-2c5cb2770392fb9c5d8518688c8bc61986d70dc6.tar.xz | |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Diffstat (limited to 'arch/x86/xen/xen-asm_32.S')
0 files changed, 0 insertions, 0 deletions