Merge branch 'master' of...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git



Unify upstream build system updates and PSCI support.

Conflicts:
	Makefile

Signed-off-by: Mark Rutland <mark.rutland@arm.com>