Merge branch 'v3.18/topic/for-stable' into linux-linaro-lsk-v3.18

* v3.18/topic/for-stable:
  arm64: psci: move psci firmware calls out of line
  ARM: 8307/1: psci: move psci firmware calls out of line

 Conflicts:
	arch/arm64/kernel/Makefile