Merge tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp into upstream
authorCatalin Marinas <catalin.marinas@arm.com>
Thu, 19 Dec 2013 17:57:51 +0000 (17:57 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 19 Dec 2013 17:57:51 +0000 (17:57 +0000)
commit0a5be743e8c3c3230600fbc0cf923fb5dbefd579
tree239236cda1f31532831af7b3214b1db6c398221c
parent6ac2104debc235b745265b64d610237a6833fd53
parent1307220d7bb79fc526d006f854ebfd2bf44e6e87
Merge tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp into upstream

* tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp:
  arm64: add CPU power management menu/entries
  arm64: kernel: add PM build infrastructure
  arm64: kernel: add CPU idle call
  arm64: enable generic clockevent broadcast
  arm64: kernel: implement HW breakpoints CPU PM notifier
  arm64: kernel: refactor code to install/uninstall breakpoints
  arm: kvm: implement CPU PM notifier
  arm64: kernel: implement fpsimd CPU PM notifier
  arm64: kernel: cpu_{suspend/resume} implementation
  arm64: kernel: suspend/resume registers save/restore
  arm64: kernel: build MPIDR_EL1 hash function data structure
  arm64: kernel: add MPIDR_EL1 accessors macros

Conflicts:
arch/arm64/Kconfig
arch/arm64/Kconfig
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/process.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/smp.c