From: Olof Johansson <olof@lixom.net>
Date: Sat, 1 Jun 2013 05:20:10 +0000 (-0700)
Subject: Merge tag 'fixes-3.10-3' of git://git.infradead.org/users/jcooper/linux into fixes
X-Git-Tag: firefly_0821_release~3680^2~270^2~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=04b5e56fc31bac04517ba7fc801736ba99088082;p=firefly-linux-kernel-4.4.55.git

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
---

04b5e56fc31bac04517ba7fc801736ba99088082