diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-22 01:26:53 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-22 01:26:53 +0300 |
| commit | 0766c17fb97b1d11abed452b923a7460e8b64dce (patch) | |
| tree | 172f0338d78d76461e5fb5e0feafa0170d87b534 /arch/arm/mach-prima2/rstc.c | |
| parent | 73298072885318557841a29dc0b99b5f0b4e2316 (diff) | |
| parent | 01ea63d99397fcdcb9cc235c77a8e11f4e4a63e9 (diff) | |
| download | linux-0766c17fb97b1d11abed452b923a7460e8b64dce.tar.xz | |
Merge tag 'atlas7-lldebug-for-3.20' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm/mach-prima2/rstc.c')
0 files changed, 0 insertions, 0 deletions