]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit '4e6a28d4681c3d6b0629e346cc6e567c28adc6f1' 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)
commit5964b94470c2f8c31d9eaee8a02e5afe7c668c3c
treeb19210e709de6ee0d22b67ef605a569500cf1a18
parenta134e0ab94170601647d046328901e57f564fdbd
parent4e6a28d4681c3d6b0629e346cc6e567c28adc6f1
Merge commit '4e6a28d4681c3d6b0629e346cc6e567c28adc6f1' 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