From: Olof Johansson <olof@lixom.net>
Date: Tue, 12 Feb 2013 03:37:51 +0000 (-0800)
Subject: Merge branch 'socfpga/hw' into next/soc
X-Git-Tag: v3.9-rc1~118^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c75c4210009d5cceced76af316c51f9e56ce630;p=pandora-kernel.git

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>
---

1c75c4210009d5cceced76af316c51f9e56ce630
Reading git-diff-tree failed