tree f2de00a55f97eda33c58251c7f46a793ad691d85
parent 5f48a29f1721736930b7817b430039c1d348dd05
parent 4de3abb348d7a5bd6ddbfc26c34e0ee549874249
author Olof Johansson <olof@lixom.net> 1360603311 -0800
committer Olof Johansson <olof@lixom.net> 1360603329 -0800

Merge branch 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/virt

From Will Deacon, this lays the foundation for a basic virtualzed machine type.

* 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  ARM: mach-virt: add SMP support using PSCI
  ARM: Dummy Virtual Machine platform support

Signed-off-by: Olof Johansson <olof@lixom.net>