diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-21 14:29:06 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-21 14:29:06 -0800 |
| commit | c1cd7adb3844d7e2e47533e485cc8bebb6725419 (patch) | |
| tree | d1b6051e6b046c87880ff99ad0c379b944c3bd55 /arch/ia64/dig/machvec.c | |
| parent | 0766c17fb97b1d11abed452b923a7460e8b64dce (diff) | |
| parent | 4cba058526a7563603ab18f06e298633dd69fc77 (diff) | |
Merge tag 'new-atlas7mach-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/soc
Merge "CSR new atlas7 machine, and delete old marco machine for 3.20" from
Barry Song:
drop CSR Marco machine and add Atlas7 new machine
This is the init support for CSR Atlas7 new SoC. Old Marco has never
shipped to customers and been dropped.
* tag 'new-atlas7mach-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
ARM: sirf: add Atlas7 machine support
ARM: sirf: move to debug_ll_io_init and drop map_io
ARM: sirf: move platsmp to support Atlas7 SoC
ARM: sirf: drop Marco machine
ARM: sirf: drop Marco support in reset controller module
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/ia64/dig/machvec.c')
0 files changed, 0 insertions, 0 deletions