From faa21ad5f889d025a553e4693ceb36c5e823dc86 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 16 Mar 2015 15:45:41 +0100 Subject: [PATCH] arm-soc: document merges Signed-off-by: Arnd Bergmann --- arch/arm/arm-soc-for-next-contents.txt | 59 ++++++++++++++++++++------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt index a989b97e181a..92209501cae2 100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@ -1,16 +1,43 @@ +next/fixes-non-critical + patch + ARM: cns3xxx: don't export static symbol + next/cleanup + mvebu/cleanup + git://git.infradead.org/linux-mvebu tags/mvebu-cleanup-4.1 + at91/cleanup2 + git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-cleanup2 + renesas/soc-cleanup2 + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-cleanup2-for-v4.1 + +next/drivers + drivers/simple-pm-bus + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-simple-pm-bus-for-v4.1 next/multiplatform renesas/soc-cleanup git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-cleanup-for-v4.1 renesas/sh7372-soc-removal git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-sh7372-soc-removal-for-v4.1 + shmobile/multiplatform-r8a7778 + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r8a7778-ccf-and-multiplatform-for-v4.1 + contains drivers/simple-pm-bus next/soc renesas/soc git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-for-v4.1 meson/soc https://github.com/carlocaione/linux-meson tags/for-v4.0-rc/meson-soc + mvebu/soc + git://git.infradead.org/linux-mvebu tags/mvebu-soc-4.1 + patch + ARM: Alpine: Initial support for Alpine platform + ARM: Alpine: early-debug print support + ARM: Alpine: smp support + ARM: dts: Alpine platform binding documentation + MAINTAINERS: add maintainer for Alpine Arm machine + renesas/da9063-da9210-quirk + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-da9063-da9210-quirk-for-v4.1 next/dt renesas/dt @@ -19,17 +46,25 @@ next/dt https://github.com/carlocaione/linux-meson tags/for-v4.0-rc/meson-dts patch devicetree: Add TI-NSPIRE USB OTG support to device tree + at91/dt + git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-dt + broadcom/dt + http://github.com/broadcom/stblinux tags/arm-soc/for-4.1/devicetree + mvebu/dt + git://git.infradead.org/linux-mvebu tags/mvebu-dt-4.1 + renesas/dt2 + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-dt2-for-v4.1 + patch + ARM: dts: Alpine platform devicetree + bcm/dt + http://github.com/broadcom/stblinux tags/arm-soc/for-4.1/devicetree-part-2 -next/drivers - drivers/simple-pm-bus - git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-simple-pm-bus-for-v4.1 - -fixes - (2d2c9a8d0a4f90e298315d2f4a282d8bd5d45e5c) - git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-fixes-dt - (ace283a04a4a6c2e04814c43251191ef8f229b26) - git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-fixes-1 - (2141102e045e622cac176891cb66c5bf08e439f5) - git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-fixes - +next/arm64 + patch + ARM64: Add new Xilinx ZynqMP SoC + arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile + arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig +next/defconfig + mvebu/defconfig + git://git.infradead.org/linux-mvebu tags/mvebu-defconfig-4.1 -- 2.39.2