]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 00:17:41 +0000 (17:17 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 00:17:41 +0000 (17:17 -0700)
* fixes:
  arm: mvebu: armada-xp-{gp,openblocks-ax3-4}: specify PCIe range
  ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().

1  2 
arch/arm/boot/dts/armada-xp-gp.dts
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

Simple merge