Merge branch 'tracking-armlt-psci' into lsk-3.10-vexpress
authorJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:02:02 +0000 (12:02 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:02:02 +0000 (12:02 +0100)
commit20b22bdf99d678c928dc67fc9b24181e44975329
tree4b944cd666908e0464f4effe9e3b13b0b581ab7d
parenta7afdd36a825639ceeaaf4b430585afc1f4b4ade
parentb5fdc36b35130308bd62a18b4682b51708a7f378
Merge branch 'tracking-armlt-psci' into lsk-3.10-vexpress

Conflicts:
arch/arm/kernel/psci.c
arch/arm/include/asm/psci.h
arch/arm/kernel/psci.c