Catalin Marinas addc8120a7 Merge branch 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux ... * 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux: arm64: psci: remove ACPI coupling arm64: psci: kill psci_power_state arm64: psci: account for Trusted OS instances arm64: psci: support unsigned return values arm64: psci: remove unnecessary id indirection arm64: smp: consistently use error codes arm64: smp_plat: add get_logical_index arm/arm64: kvm: add missing PSCI include Conflicts: arch/arm64/kernel/smp.c		2015-06-05 11:21:23 +01:00
..
boot	ARM64: juno: add sp810 support and fix sp804 clock frequency	2015-05-12 16:39:28 +02:00
configs	ARM: SoC 64-bit changes for v4.1	2015-04-22 09:23:58 -07:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-05-11 11:05:13 -07:00
include	Merge branch 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux	2015-06-05 11:21:23 +01:00
kernel	Merge branch 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux	2015-06-05 11:21:23 +01:00
kvm	arm64 updates for 4.1:	2015-04-16 13:58:29 -05:00
lib	arm64: __clear_user: handle exceptions on strb	2014-11-13 15:21:26 +00:00
mm	arm64: alternative: Merge alternative-asm.h into alternative.h	2015-06-05 10:38:53 +01:00
net	arm64: bpf: fix signedness bug in loading 64-bit immediate	2015-05-08 16:15:07 +01:00
xen	arm: xen: implement multicall hypercall support.	2014-04-24 13:09:46 +01:00
Kconfig	arm64: Allow forced irq threading	2015-05-19 15:27:42 +01:00
Kconfig.debug	coresight: moving to new "hwtracing" directory	2015-04-03 16:17:04 +02:00
Makefile	arm64: Adjust EFI libstub object include logic	2015-03-17 16:59:47 +00:00