From: Arnd Bergmann Date: Fri, 26 Oct 2012 12:45:06 +0000 (+0200) Subject: Merge branch 'v3.7-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~3680^2~1703^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=389a84d2c1c62f0232b5239017c81ee88b2613ae;p=firefly-linux-kernel-4.4.55.git Merge branch 'v3.7-samsung-fixes-2' of git://git./linux/kernel/git/kgene/linux-samsung into fixes From Kukjin Kim : One is spi stuff for fix the device names for the different subtypes of the spi controller. And the other is adding missing .smp field for exynos4-dt and fixing memory sections for exynos4210-trats board. * 'v3.7-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Set .smp field of machine descriptor for exynos4-dt ARM: dts: Split memory into 4 sections for exynos4210-trats ARM: SAMSUNG: Add naming of s3c64xx-spi devices Signed-off-by: Arnd Bergmann --- 389a84d2c1c62f0232b5239017c81ee88b2613ae