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-Tag: v3.15-rc6~42^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1270f063f95c9c57c59b60c7122603e633c6e276;p=thirdparty%2Fkernel%2Flinux.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