git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd97988
683b6c6
)
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
author
David Vrabel
<david.vrabel@citrix.com>
Mon, 7 Apr 2014 12:52:12 +0000
(13:52 +0100)
committer
David Vrabel
<david.vrabel@citrix.com>
Mon, 7 Apr 2014 12:52:12 +0000
(13:52 +0100)
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff