From: Olof Johansson <olof@lixom.net>
Date: Mon, 19 Jan 2015 18:57:35 +0000 (-0800)
Subject: Merge tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: fixes-v4.0-rc1~86^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a77c7ce479b871002410bd51a81e74c9f24260;p=pandora-kernel.git

Merge tag 'atlas7-init-dts-for-3.20' of git://git./linux/kernel/git/baohua/linux into next/dt

Merge "CSR atlas7 init dts for 3.20" from Barry Song:

Drop Marco and add init dts stuff for Atlas7

CSR Marco SoC has never shipped to customers that could be interested
in mainline support. and new Atlas7 is a replacement SoC that is in
development.

So we drop Marco dts stuff, and add dts stuff for Atlas7.

* tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: dts: add init dts file for CSR atlas7 SoC
  ARM: dts: drop MARCO platform DT stuff

Signed-off-by: Olof Johansson <olof@lixom.net>
---

e2a77c7ce479b871002410bd51a81e74c9f24260
Reading git-diff-tree failed