Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...
authorOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 22:04:34 +0000 (14:04 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 22:04:34 +0000 (14:04 -0800)
commit103e76b3d6dadb7e3d610c67131020d9bdb35fa7
treebe139f2adc370038408f6d0e4a36f3cd3d4669af
parentc38183c8338aea26ad2cd1f922df63fe7f2420d8
parent54b56e62d20ac0de6e8e12b7efdaf3a1b9b6541c
Merge tag 'samsung-defconfig' of git://git./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>