Merge remote branch 'stefano-kernelorg/3.9-rc3-psci-ops-7' into 3.9-rc3-psci-xen-1