Merge branch 'socfpga/hw' into next/soc
authorOlof Johansson <olof@lixom.net>
Tue, 12 Feb 2013 03:37:51 +0000 (19:37 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 12 Feb 2013 03:37:51 +0000 (19:37 -0800)
commit1c75c4210009d5cceced76af316c51f9e56ce630
treecfa3600b25fe8ca385ddc6a2cd230da876312dcb
parent877cd953167bc50765719ca047a3ac2c4fdd7aaf
parentd6dd735f4bda19bfe07d96d9025c94c4619d4596
Merge branch 'socfpga/hw' into next/soc

From Dinh Nguyen, this is a series of patches introducing support for
socfpga hardware (Altera Cyclone5). It also includes a cleanup that
moves some of the ARMv7 cache maintenance functions to a common location,
since three other platforms aready implemented it separately.

* socfpga/hw:
  arm: socfpga: Add SMP support for actual socfpga harware
  arm: Add v7_invalidate_l1 to cache-v7.S
  arm: socfpga: Add entries to enable make dtbs socfpga
  arm: socfpga: Add new device tree source for actual socfpga HW

Trivial conflict in arch/arm/mach-tegra/headsmp.S.

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/Makefile
arch/arm/mach-socfpga/platsmp.c
arch/arm/mach-socfpga/socfpga.c
arch/arm/mach-tegra/headsmp.S