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)
commit04b5e56fc31bac04517ba7fc801736ba99088082
tree8d6ba5fb703e9c85f7a9ba82da40eb04e112a465
parentd683b96b072dc4680fc74964eca77e6a23d1fa6e
parentb60b61d41220c8d34e2c62a748bc78bc5d40585e
Merge tag 'fixes-3.10-3' of git://git.infradead.org/users/jcooper/linux into fixes

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