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