projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f48a29 4de3abb)
Merge branch 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 11 Feb 2013 17:21:51 +0000 (09:21 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 11 Feb 2013 17:22:09 +0000 (09:22 -0800)
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>
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git