tree cfa3600b25fe8ca385ddc6a2cd230da876312dcb
parent 877cd953167bc50765719ca047a3ac2c4fdd7aaf
parent d6dd735f4bda19bfe07d96d9025c94c4619d4596
author Olof Johansson <olof@lixom.net> 1360640271 -0800
committer Olof Johansson <olof@lixom.net> 1360640271 -0800

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>