From: Arnd Bergmann Date: Thu, 25 Oct 2012 15:24:02 +0000 (+0200) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20121029~16^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d2b5e1791b3302917fdf3eb5b5ea792143c1662;p=karo-tx-linux.git Merge branch 'next/soc' into for-next --- 1d2b5e1791b3302917fdf3eb5b5ea792143c1662 diff --cc arch/arm/arm-soc-for-next-contents.txt index 611493b791cf,000000000000..ce1b8a3443ac mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,15 -1,0 +1,16 @@@ +arm-soc for-next contents for 3.8: + +next/fixes-non-critical: +vexpress/fixes git://git.linaro.org/people/pawelmoll/linux.git vexpress-fixes + +next/cleanup: +imx/multiplatform git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-platform + (pulled twice) +vt8500/cleanup git://server.prisktech.co.nz/git/linuxwmt.git/ tags/cleanup-for-3.8 + +next/soc: +ux500/core git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core ++clps711x/soc patches from Alexander Shiyan + +next/smp: +socfpga/smp patch from Dinh Nguyen