From: Olof Johansson <olof@lixom.net>
Date: Fri, 19 Apr 2013 18:50:25 +0000 (-0700)
Subject: Merge branch 'at91/soc' into late/cleanup
X-Git-Tag: v3.10-rc1~62^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a71efd61db6368629b1b3e403076c957207f79bd;p=~emulex%2Finfiniband.git

Merge branch 'at91/soc' into late/cleanup

* at91/soc:
  ARM: at91: add defconfig for SAMA5
  ARM: at91: dt: add device tree files for SAMA5D3 family
  ARM: at91: introduce SAMA5 support
  ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch
  ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation
  ARM: at91: change name template in AT91_SOC_START macro
  ARM: at91: renamme rm9200 dt file
  ARM: at91: rename board-dt to more specific name board-dt-sam9
  ARM: at91: move non DT Kconfig to Kconfig.non_dt
---

a71efd61db6368629b1b3e403076c957207f79bd