diff options
author | Olof Johansson <olof@lixom.net> | 2013-06-12 00:01:01 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-12 00:05:56 (GMT) |
commit | 323226bbb3d865af12644d66df2b7f161adf51c7 (patch) | |
tree | 2f0b676c65927d9f798100690e70b3a52d57d313 /arch/powerpc/kvm/book3s_hv_ras.c | |
parent | cd3fc1b9a34e535a8acbead7461475fbc43bdd49 (diff) | |
parent | 5f1f3d5088316f827591764aa6a5e7161eb514bd (diff) | |
download | linux-323226bbb3d865af12644d66df2b7f161adf51c7.tar.xz |
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>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_ras.c')
0 files changed, 0 insertions, 0 deletions