]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit '36aefa0025ecaf901758380ff8fb57710cb6e446' 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)
commit38ced5c2cdd8cda6959337f48c675adfa78ac86c
treeb19210e709de6ee0d22b67ef605a569500cf1a18
parentfbe332f8552932a98e4b7b0ef8bb9977b5e876cf
parent36aefa0025ecaf901758380ff8fb57710cb6e446
Merge commit '36aefa0025ecaf901758380ff8fb57710cb6e446' 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