]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'soc-3.13-2' of git://git.infradead.org/linux-mvebu into next/soc
authorKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 22:05:07 +0000 (15:05 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 22:05:15 +0000 (15:05 -0700)
commit0d481d4187d05b253374bda9e146fa3bc17a9244
tree5775d9734fe8cde9a20a0a3e44f162449589120c
parent7bc13d78c647979abd6632d95fefd0b353122b0c
parentd7f5baeedbdb48d4f5bb2b4f6f56f32b7f2f7aff
Merge tag 'soc-3.13-2' of git://git.infradead.org/linux-mvebu into next/soc

From Jason Cooper:
mvebu soc changes for v3.13 (round 2)

 - kirkwood
    - remove mbus init, pcie clk init
    - retain MAC addr for DT ethernet (work around broken IP)
    - docs: clarify Armada SoCs

* tag 'soc-3.13-2' of git://git.infradead.org/linux-mvebu:
  Documentation: arm/Marvell: clarify Armada SoCs that match 78xx0 pattern
  ARM: kirkwood: retain MAC address for DT ethernet
  ARM: kirkwood: Remove unneeded PCIe clock adding
  ARM: kirkwood: Remove unneeded MBus initialization
  ARM: kirkwood: Add standby support

Signed-off-by: Kevin Hilman <khilman@linaro.org>