Merge tag 'mvebu-fixes-4.0' of git://git.infradead.org/linux-mvebu into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 20:55:38 +0000 (13:55 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 20:55:38 +0000 (13:55 -0700)
Merge "ARM: mvebu: fixes for v4.0" from Gregory Clement:

mvebu fix for 4.0

Disable CPU Idle on Armada 38x

* tag 'mvebu-fixes-4.0' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Disable CPU Idle on Armada 38x

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge