Merge remote-tracking branch 'origin/v3.18/topic/pcie/master' into linux-linaro-lsk-v3.18

Conflicts solution:
	/* Using the latest version dts', that is except the serial
	 * port definition in juno.dts, others keep the pcie/master
	 * version.
	 */
	arch/arm64/boot/dts/arm/Makefile
	arch/arm64/boot/dts/arm/juno-clocks.dtsi
	arch/arm64/boot/dts/arm/juno.dts