From: Olof Johansson Date: Tue, 20 May 2014 04:52:18 +0000 (-0700) Subject: Merge tag 'mvebu-drivers-3.16' of git://git.infradead.org/linux-mvebu into next/drivers X-Git-Tag: firefly_0821_release~176^2~3465^2~43^2~15 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=02be9746e3169f92010872d111eef51404ee99c5;p=firefly-linux-kernel-4.4.55.git 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 --- 02be9746e3169f92010872d111eef51404ee99c5