From: Arnd Bergmann Date: Fri, 23 May 2014 22:59:25 +0000 (+0200) Subject: arm-soc: document last merges X-Git-Tag: next-20140530~119^2~37 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=82db6c3dfa4c2fffbada165af281a40049fa4fb7;p=karo-tx-linux.git arm-soc: document last merges Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt index f452dfb40794..9a9ac6c83384 100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@ -14,6 +14,8 @@ next/cleanup git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux tags/sirf-soc-for-3.16 vexpress/updates git://git.linaro.org/people/pawel.moll/linux tags/vexpress/updates-for-3.16 + bcm/cleanup + git://github.com/broadcom/mach-bcm tags/for-3.16/bcm-cleanup next/soc renesas/soc @@ -55,6 +57,8 @@ next/soc git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom qcom-soc-for-3.16 sunxi/core2 https://github.com/mripard/linux sunxi-core-for-3.16-2 + bcm/soc + git://github.com/broadcom/mach-bcm tags/for-3.16/bcm-soc next/soc2 keystone/soc @@ -159,3 +163,12 @@ next/drivers git://git.infradead.org/linux-mvebu tags/mvebu-drivers-3.16 sunxi/drivers https://github.com/mripard/linux sunxi/drivers-for-3.16 + sunxi/drivers2 + https://github.com/mripard/linux sunxi/drivers-for-3.16 + qcom/socdriver + git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-drivers-for-3.16 + patches + Documentation: sysfs: add Broadcom GISB arbiter sysfs properties + Documentation: devicetree: add Broadcom GISB arbiter bindings + bus: add Broadcom GISB bus arbiter timeout/error handler +