Merge tag 'mvebu-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixes
authorOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 05:27:30 +0000 (22:27 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 05:27:30 +0000 (22:27 -0700)
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 <olof@lixom.net>

Trivial merge