From: Olof Johansson Date: Sun, 22 Dec 2013 22:04:34 +0000 (-0800) Subject: Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Tag: v3.14-rc1~111^2~11 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=103e76b3d6dadb7e3d610c67131020d9bdb35fa7;p=linux.git Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards From Kukjin Kim: exynos_defconfig updates for v3.14 - increase number of CPU to 8 for EXYNOS SoCs * tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: exynos_defconfig: increase CONFIG_NR_CPUS value to 8 Signed-off-by: Olof Johansson --- 103e76b3d6dadb7e3d610c67131020d9bdb35fa7