From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 26 Oct 2012 13:02:53 +0000 (+0200)
Subject: Merge branch 'next/smp' into for-next
X-Git-Tag: next-20121029~16^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=89639b5d3b3a1960fbb153f47c0326ad3f478972;p=karo-tx-linux.git

Merge branch 'next/smp' into for-next

new version of the socfpga patch, replacing the older one.

Conflicts:
	arch/arm/configs/socfpga_defconfig
	arch/arm/mach-socfpga/platsmp.c
---

89639b5d3b3a1960fbb153f47c0326ad3f478972