From: Arnd Bergmann Date: Thu, 25 Oct 2012 13:55:09 +0000 (+0200) Subject: Merge branch 'next/smp' into for-next X-Git-Tag: next-20121026~15^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4d6c13b05946c585cb5803268a07efceb8eff141;p=karo-tx-linux.git Merge branch 'next/smp' into for-next Signed-off-by: Arnd Bergmann --- 4d6c13b05946c585cb5803268a07efceb8eff141 diff --cc arch/arm/arm-soc-for-next-contents.txt index 4702059607ef,000000000000..d9f353a241a6 mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,11 -1,0 +1,14 @@@ +arm-soc for-next contents for 3.8: + +next/fixes-non-critical: + +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 ++ ++next/smp: ++socfpga/smp patch from Dinh Nguyen