git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd97988 683b6c6)
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
authorDavid Vrabel <david.vrabel@citrix.com>
Mon, 7 Apr 2014 12:52:12 +0000 (13:52 +0100)
committerDavid Vrabel <david.vrabel@citrix.com>
Mon, 7 Apr 2014 12:52:12 +0000 (13:52 +0100)
commit2c5cb2770392fb9c5d8518688c8bc61986d70dc6
treeb19210e709de6ee0d22b67ef605a569500cf1a18tree
parentcd979883b9ede90643e019f33cb317933eb867b4commit | diff
parent683b6c6f82a60fabf47012581c2cfbf1b037ab95commit | 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
drivers/xen/events/events_base.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.