Rafael J. Wysocki d5f017b796 Merge branch 'acpi-tables' ... * acpi-tables: ACPI: Rename configfs.c to acpi_configfs.c to prevent link error ACPI: add support for loading SSDTs via configfs ACPI: add support for configfs efi / ACPI: load SSTDs from EFI variables spi / ACPI: add support for ACPI reconfigure notifications i2c / ACPI: add support for ACPI reconfigure notifications ACPI: add support for ACPI reconfiguration notifiers ACPI / scan: fix enumeration (visited) flags for bus rescans ACPI / documentation: add SSDT overlays documentation ACPI: ARM64: support for ACPI_TABLE_UPGRADE ACPI / tables: introduce ARCH_HAS_ACPI_TABLE_UPGRADE ACPI / tables: move arch-specific symbol to asm/acpi.h ACPI / tables: table upgrade: refactor function definitions ACPI / tables: table upgrade: use cacheable map for tables Conflicts: arch/arm64/include/asm/acpi.h		2016-07-25 13:41:01 +02:00
..
boot	arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2	2016-06-03 12:13:15 -07:00
configs	Merge git://www.linux-watchdog.org/linux-watchdog	2016-05-25 10:19:17 -07:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-03-17 11:22:54 -07:00
include	Merge branch 'acpi-tables'	2016-07-25 13:41:01 +02:00
kernel	Merge branch 'acpi-tables'	2016-07-25 13:41:01 +02:00
kvm	arm64: KVM: vgic-v3: Relax synchronization when SRE==1	2016-05-31 16:12:17 +02:00
lib	arm64 updates for 4.6:	2016-03-17 20:03:47 -07:00
mm	Merge branch 'acpi-numa'	2016-07-25 13:40:39 +02:00
net	bpf: arm64: remove callee-save registers use for tmp registers	2016-05-17 14:03:33 -04:00
xen	xen/arm: introduce HYPERVISOR_platform_op on arm and arm64	2015-12-21 14:40:56 +00:00
Kconfig	ACPI: ARM64: support for ACPI_TABLE_UPGRADE	2016-06-22 01:16:15 +02:00
Kconfig.debug	arm64: enable CONFIG_SET_MODULE_RONX by default	2016-05-31 14:23:29 +01:00
Kconfig.platforms	ARM: SoC 64-bit changes for v4.7	2016-05-18 12:43:08 -07:00
Makefile	arm64: fix boot image dependencies to not generate invalid images	2016-06-21 20:10:18 +01:00