Merge tag 'fixes-3.10-3' of git://git.infradead.org/users/jcooper/linux into fixes
authorOlof Johansson <olof@lixom.net>
Sat, 1 Jun 2013 05:20:10 +0000 (22:20 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 2 Jun 2013 18:50:40 +0000 (11:50 -0700)
From Jason Cooper, mvebu fixes for v3.10 round 3:
 - mvebu
    - fix bug in coherency fabric low level init
 - kirkwood
    - fix crash from pcie double init

Signed-off-by: Olof Johansson <olof@lixom.net>
* tag 'fixes-3.10-3' of git://git.infradead.org/users/jcooper/linux:
  ARM: mvebu: Fix bug in coherency fabric low level init function
  ARM: Kirkwood: TS219: Fix crash by double PCIe instantiation


Trivial merge