linux/arch/arm/include
David Vrabel 2c5cb27703 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
2014-04-07 13:52:12 +01:00
..
asm Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15 2014-04-07 13:52:12 +01:00
debug i.MX SoC changes for 3.14: 2014-01-02 12:10:12 -08:00
uapi/asm First round of KVM updates for 3.14; PPC parts will come next week. 2014-01-22 21:40:43 -08:00