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 <olof@lixom.net>