From: Olof Johansson Date: Wed, 4 Dec 2013 21:38:46 +0000 (-0800) Subject: Merge branch 'next/drivers' into for-next X-Git-Tag: next-20131210~98^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff435ea7df82f434d2a5458fd96570a538f2bc06;p=karo-tx-linux.git Merge branch 'next/drivers' into for-next * next/drivers: spi: s3c64xx: Always select S3C64XX_PL080 when ARCH_S3C64XX is enabled clk: samsung: s3c64xx: Remove clock aliases of old DMA driver ARM: s3c64xx: Remove legacy DMA driver clk: samsung: s3c64xx: Add aliases for DMA clocks ARM: s3c64xx: Add support for DMA using generic amba-pl08x driver spi: s3c64xx: Do not require legacy DMA API in case of S3C64XX Signed-off-by: Olof Johansson --- ff435ea7df82f434d2a5458fd96570a538f2bc06 diff --cc arch/arm/arm-soc-for-next-contents.txt index e7924a2b0a9c,000000000000..c248ed0adcea mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,29 -1,0 +1,31 @@@ +Contents of arm-soc branches contained in for-next + + +next/cleanup + renesas/cleanup + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.14 + mvebu/soc + git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14 + +next/soc + patches + ARM: ep93xx: remove deprecated IRQF_DISABLED + ARM: ep93xx: use soc bus + +next/dt + ux500/dt + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-devicetree-v3.14-1 + mvebu/dt + git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14 + +next/boards + renesas/defconfig + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.14 + mvebu/defconfig + git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14 + +next/drivers + mvebu/drivers + git://git.infradead.org/linux-mvebu.git tags/mvebu-drivers-3.14 ++ samsung/s3c64xx-dmaengine ++ git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/s3c64xx-dmaengine