Merge branch 'juno-hmp' into juno-release
authorLiviu Dudau <Liviu.Dudau@arm.com>
Mon, 12 May 2014 12:33:47 +0000 (13:33 +0100)
committerLiviu Dudau <Liviu.Dudau@arm.com>
Mon, 12 May 2014 12:33:47 +0000 (13:33 +0100)
commit0ed51be35d5bac3d4b0646d86ca30f25fe424ac0
treec9cb6c8425cd2e8c0201233739e910cffe01574c
parenta121db30cb56185eb431fdac6693f879da793f5a
parent58d5cdd4461ea6e09c3132be3b0d287eee5473c0
Merge branch 'juno-hmp' into juno-release

Conflicts:
arch/arm64/kernel/topology.c
arch/arm64/Kconfig
kernel/sched/core.c