Rafael J. Wysocki efc499f980 Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi' ... * acpi-numa: ACPI / SRAT: fix SRAT parsing order with both LAPIC and X2APIC present * acpi-tables: ACPI / tables: Fix DSDT override mechanism ACPI / tables: Convert initrd table override to table upgrade mechanism ACPI / x86: Cleanup initrd related code ACPI / tables: Move table override mechanisms to tables.c * acpi-osi: ACPI / osi: Collect _OSI handling into one single file ACPI / osi: Cleanup coding style issues before creating a separate OSI source file ACPI / osi: Cleanup OSI handling code to use bool ACPI / osi: Fix default _OSI(Darwin) support ACPI / osi: Add acpi_osi=!! to allow reverting acpi_osi=! ACPI / osi: Cleanup _OSI("Linux") related code before introducing new support ACPI / osi: Fix an issue that acpi_osi=!* cannot disable ACPICA internal strings Conflicts: drivers/acpi/internal.h		2016-05-16 16:45:25 +02:00
..
boot	x86/build: Build compressed x86 kernels as PIE	2016-03-29 12:51:12 +02:00
configs	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-03-17 11:33:45 -07:00
crypto	crypto: sha1-mb - use corrcet pointer while completing jobs	2016-04-15 22:13:56 +08:00
entry	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-24 09:47:32 -07:00
events	perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs	2016-05-05 10:11:28 +02:00
ia32	Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-11-03 21:05:40 -08:00
include	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-04-28 20:19:04 -07:00
kernel	Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi'	2016-05-16 16:45:25 +02:00
kvm	mm: thp: kvm: fix memory corruption in KVM with THP enabled	2016-05-05 17:38:53 -07:00
lguest	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-14 17:58:53 -07:00
lib	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-24 09:47:32 -07:00
math-emu	Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-11-03 21:05:40 -08:00
mm	Revert "x86/mm/32: Set NX in __supported_pte_mask before enabling paging"	2016-04-26 19:52:57 +02:00
net	x86/asm/bpf: Create stack frames in bpf_jit.S	2016-02-24 08:35:44 +01:00
oprofile	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-24 09:47:32 -07:00
pci	PCI changes for the v4.6 merge window:	2016-03-16 14:45:55 -07:00
platform	Merge branches 'acpi-drivers', 'acpi-pm', 'acpi-ec' and 'acpi-video'	2016-05-16 16:44:41 +02:00
power	x86/asm/power: Create stack frames in hibernate_asm_64.S	2016-02-24 08:35:43 +01:00
purgatory	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-24 09:47:32 -07:00
ras	x86/topology: Fix AMD core count	2016-03-29 10:45:04 +02:00
realmode	kernel: add kcov code coverage	2016-03-22 15:36:02 -07:00
tools
um	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
video	x86/video: Don't assume all FB devices are PCI devices	2016-03-15 11:08:26 +01:00
xen	xen/qspinlock: Don't kick CPU if IRQ is not initialized	2016-04-23 13:40:02 +02:00
.gitignore
Kbuild	perf/x86: Move perf_event.c ............... => x86/events/core.c	2016-02-09 10:23:49 +01:00
Kconfig	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-24 10:02:14 -07:00
Kconfig.cpu	x86/Kconfig/cpus: Fix/complete CPU type help texts	2015-10-21 11:12:56 +02:00
Kconfig.debug	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-15 09:32:27 -07:00
Makefile	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-11-04 09:11:12 -08:00
Makefile_32.cpu
Makefile.um