diff options
author | Olof Johansson <olof@lixom.net> | 2014-05-19 21:52:18 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-05-19 21:52:18 -0700 |
commit | 02be9746e3169f92010872d111eef51404ee99c5 (patch) | |
tree | eb7b8e6d403235291f7f64d4e198aaf507be387d /drivers/reset | |
parent | eb7e855b417653e822ab7edb2b65933dfe2aa5a1 (diff) | |
parent | 0456d3300edba52e47c6b5582cfe9d87756f5590 (diff) | |
download | linux-rpi3-02be9746e3169f92010872d111eef51404ee99c5.tar.gz linux-rpi3-02be9746e3169f92010872d111eef51404ee99c5.tar.bz2 linux-rpi3-02be9746e3169f92010872d111eef51404ee99c5.zip |
Merge tag 'mvebu-drivers-3.16' of git://git.infradead.org/linux-mvebu into next/drivers
Merge "ARM: mvebu: driver changes for v3.16" from Jason Cooper:
mvebu driver changes for v3.16
- mvebu-devbus
- changes need to add support for the orion5x platform
* tag 'mvebu-drivers-3.16' of git://git.infradead.org/linux-mvebu:
memory: mvebu-devbus: add a devbus, keep-config property
memory: mvebu-devbus: add Orion5x support
memory: mvebu-devbus: split functions
memory: mvebu-devbus: use _SHIFT suffixes instead of _BIT
memory: mvebu-devbus: use ARMADA_ prefix in defines
ARM: orion5x: fix target ID for crypto SRAM window
memory: mvebu-devbus: fix the conversion of the bus width
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/reset')
0 files changed, 0 insertions, 0 deletions