Merge branch 'for-next/cpu-init' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorCatalin Marinas <catalin.marinas@arm.com>
Tue, 19 May 2015 15:15:22 +0000 (16:15 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 19 May 2015 15:15:22 +0000 (16:15 +0100)
* 'for-next/cpu-init' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  ARM64: kernel: unify ACPI and DT cpus initialization
  ARM64: kernel: make cpu_ops hooks DT agnostic


Trivial merge