]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 077495d 0d481d4)
Merge branch 'next/soc' into for-next
authorKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 22:15:43 +0000 (15:15 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 22:16:31 +0000 (15:16 -0700)
commita7121049a5af2c251f0ba02db5e2d86a8cb7f8ac
treed9888445e91c5a20634644b07b14e60373c4bab5tree | snapshot
parent077495d50690b3b04248fd6cc3d61a7cc607d6dbcommit | diff
parent0d481d4187d05b253374bda9e146fa3bc17a9244commit | diff
Merge branch 'next/soc' into for-next

* next/soc:
  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>
Conflicts:
arch/arm/mach-kirkwood/board-dt.c
arch/arm/arm-soc-for-next-contents.txt diff1 | | blob | history
arch/arm/mach-kirkwood/board-dt.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules