From: Olof Johansson <olof@lixom.net>
Date: Wed, 12 Jun 2013 00:01:01 +0000 (-0700)
Subject: Merge tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux into fixes
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=323226bbb3d865af12644d66df2b7f161adf51c7;p=linux-beck.git

Merge tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper, mvebu fixes for v3.10 round 4:
 - mvebu
    - fix PCIe ranges property so NOR flash is visible
 - kirkwood
    - fix identification of 88f6282 so MPPs can be set correctly

* tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: armada-xp-{gp,openblocks-ax3-4}: specify PCIe range
  ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().

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

323226bbb3d865af12644d66df2b7f161adf51c7