From: Arnd Bergmann Date: Wed, 4 Mar 2015 23:01:30 +0000 (+0100) Subject: arm-soc: document merges X-Git-Tag: KARO-TXA5-2015-06-26~151^2~59 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c419b68f817c8c1a9f3da6e7d84492a402502e09;p=karo-tx-linux.git arm-soc: document 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 44ee13f8abca..a989b97e181a 100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@ -17,6 +17,8 @@ next/dt git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-dt-for-v4.1 meson/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 next/drivers drivers/simple-pm-bus