From: Olof Johansson Date: Sat, 22 Sep 2012 20:22:21 +0000 (-0700) Subject: Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into... X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~1^2^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80868a36913e11cfcd06764699b4284d34be0e59;p=pandora-kernel.git Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood * 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux: ARM: Dove: allow PCI to be disabled ARM: dove: SolidRun CuBox DT ARM: dove: add device tree descriptors ARM: dove: add device tree based machine descriptor ARM: dove: add crypto engine ARM: dove: add clock gating control ARM: dove: unify clock setup ARM: initial DTS support for km_kirkwood arm: add documentation describing Marvell families of SoC ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar ARM: Kirkwood: Iomega ix2-200 DT support Context conflicts in arch/arm/Kconfig and arch/arm/mach-dove/common.c. The new device trees added to arch/arm/mach-kirkwood/Makefile.boot are kept and dealt with in a separate changeset, since moving them out to the new Makefile in this merge commit doesn't work well. Signed-off-by: Olof Johansson --- 80868a36913e11cfcd06764699b4284d34be0e59 Reading git-diff-tree failed