tree de84cba276c224bcc4c1070a58a4f19625960723
parent eb7c11ee3c5ce6c45ac28a5015a8e60ed458b412
parent c5a1330573c1748179898f4799f130e416ce4738
author Catalin Marinas <catalin.marinas@arm.com> 1433499683 +0100
committer Catalin Marinas <catalin.marinas@arm.com> 1433499683 +0100

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