diff options
author | Olof Johansson <olof@lixom.net> | 2013-10-31 10:34:01 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-10-31 10:34:20 -0700 |
commit | 07eb663b7ec7fdb9c325e22e83f5975c724b6249 (patch) | |
tree | d8a4189703dd98a20d1e4c5fceff5f193f305da9 /arch/mips/include/asm/sgi | |
parent | ed76956f7089e34052a475fd13a903d2b69e381b (diff) | |
parent | 45e8815fc1b7ed66729bbbc9464228ee1769b580 (diff) | |
download | talos-obmc-linux-07eb663b7ec7fdb9c325e22e83f5975c724b6249.tar.gz talos-obmc-linux-07eb663b7ec7fdb9c325e22e83f5975c724b6249.zip |
Merge tag 'dt-3.13-5' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper:
- add the Openblocks A7 board
- add Netgear ReadyNAS 104 board
* tag 'dt-3.13-5' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Add Netgear ReadyNAS 104 board
ARM: kirkwood: add support for OpenBlocks A7 platform
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/mips/include/asm/sgi')
0 files changed, 0 insertions, 0 deletions