Merge remote-tracking branch 'lsk/v3.10/topic/juno' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 8 May 2014 11:11:25 +0000 (12:11 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 8 May 2014 11:11:25 +0000 (12:11 +0100)
commit8810719ecbb78766c7525c60888057bc6a675787
treee32400f1fe4ee7fcc6908854782ef4c0f4c752e8
parent9b92dfc49a8f25459548a316b653f0ab5a2c0afb
parent6c658548ecfae02ab544d55a9b60b823e44eb456
Merge remote-tracking branch 'lsk/v3.10/topic/juno' into linux-linaro-lsk

Conflicts:
arch/arm64/boot/dts/Makefile
arch/arm64/boot/dts/Makefile