From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 19 Dec 2013 17:57:51 +0000 (+0000)
Subject: Merge tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp into upstream
X-Git-Tag: v3.14-rc1~153^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a5be743e8c3c3230600fbc0cf923fb5dbefd579;p=pandora-kernel.git

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
---

0a5be743e8c3c3230600fbc0cf923fb5dbefd579
Reading git-diff-tree failed