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
..
events	Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15	2014-04-07 13:52:12 +01:00
xen-pciback	xen-pciback: Use pci_enable_msix_exact() instead of pci_enable_msix()	2014-02-28 15:26:27 -05:00
xenbus	xen/xenbus: remove unused xenbus_bind_evtchn()	2014-02-28 15:26:23 -05:00
xenfs
acpi.c
balloon.c	xen/balloon: flush persistent kmaps in correct position	2014-03-25 10:38:30 +00:00
biomerge.c
cpu_hotplug.c
dbgp.c	xen: Use dev_is_pci() to check whether it is pci device	2014-01-07 09:53:33 -05:00
evtchn.c	xen/evtchn: support more than 4096 ports	2014-01-06 10:07:50 -05:00
fallback.c
features.c
gntalloc.c
gntdev.c	Revert "xen/grant-table: Avoid m2p_override during mapping"	2014-02-03 06:44:49 -05:00
grant-table.c	xen/grant-table: Refactor gnttab_[un]map_refs to avoid m2p_override	2014-03-18 14:40:19 +00:00
Kconfig	Features:	2014-01-22 22:00:18 -08:00
Makefile	ia64/xen: Remove Xen support for ia64 even more	2014-02-11 10:12:37 -05:00
manage.c	xen/acpi-processor: fix enabling interrupts on syscore_resume	2014-03-18 14:40:20 +00:00
mcelog.c
pci.c	xen/pci: Fix build on non-x86	2014-01-06 10:07:30 -05:00
pcpu.c	drivers: xen: Include appropriate header file in pcpu.c	2014-02-28 15:26:08 -05:00
platform-pci.c	drivers: xen: Mark function as static in platform-pci.c	2014-02-28 15:26:04 -05:00
privcmd.c	xen: privcmd: do not return pages which we have failed to unmap	2013-12-06 17:55:56 +00:00
privcmd.h
swiotlb-xen.c	xen: swiotlb: handle sizeof(dma_addr_t) != sizeof(phys_addr_t)	2014-01-30 12:54:20 +00:00
sys-hypervisor.c
tmem.c
xen-acpi-cpuhotplug.c	Merge branch 'acpi-cleanup' into acpi-hotplug	2013-12-07 01:05:17 +01:00
xen-acpi-memhotplug.c	Merge branch 'acpi-cleanup' into acpi-hotplug	2013-12-07 01:05:17 +01:00
xen-acpi-pad.c	ACPI: Clean up inclusions of ACPI header files	2013-12-07 01:03:14 +01:00
xen-acpi-processor.c	xen/acpi-processor: fix enabling interrupts on syscore_resume	2014-03-18 14:40:20 +00:00
xen-balloon.c
xen-selfballoon.c	drivers:xen-selfballoon:reset 'frontswap_inertia_counter' after frontswap_shrink	2014-02-28 15:26:12 -05:00
xen-stub.c