| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 | [log] [tgz] |
|---|---|---|
| author | David Vrabel <david.vrabel@citrix.com> | Mon Apr 07 13:52:12 2014 +0100 |
| committer | David Vrabel <david.vrabel@citrix.com> | Mon Apr 07 13:52:12 2014 +0100 |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 [diff] | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 [diff] |
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