From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 Jan 2015 22:26:53 +0000 (-0800)
Subject: Merge tag 'atlas7-lldebug-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: fixes-v4.0-rc1~87^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0766c17fb97b1d11abed452b923a7460e8b64dce;p=pandora-kernel.git

Merge tag 'atlas7-lldebug-for-3.20' of git://git./linux/kernel/git/baohua/linux into next/soc

Merge "CSR atlas7 debug ports for 3.20" from Barry Song:

add debug ports for CSRatlas7 SoC

Because Marco chip has never shipped to customers and has been replaced
by Atlas7, so we do the below
- drop Marco's debug port
- add debug ports for Atlas7

* tag 'atlas7-lldebug-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: sirf: add two debug ports for CSRatlas7 SoC
  ARM: sirf: drop Marco low-level debug port

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

0766c17fb97b1d11abed452b923a7460e8b64dce
Reading git-diff-tree failed