From: Olof Johansson Date: Mon, 5 May 2014 05:27:30 +0000 (-0700) Subject: Merge tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixes X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1270f063f95c9c57c59b60c7122603e633c6e276;p=linux-beck.git Merge tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixes From Jason Cooper: mvebu fixes for v3.15 - devbus: fix bus-width conversion - orion5x: fix target ID for crypto SRAM window * tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu: ARM: orion5x: fix target ID for crypto SRAM window memory: mvebu-devbus: fix the conversion of the bus width Signed-off-by: Olof Johansson --- 1270f063f95c9c57c59b60c7122603e633c6e276