From: Olof Johansson Date: Sun, 22 Dec 2013 22:06:14 +0000 (-0800) Subject: Merge tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b20d1c9022493b194a88acac0289ff09fedaf92;p=linux-beck.git Merge tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc From Kukjin Kim: Samsung updates for v3.14 - Skip eint_init() for pinctrl-exynos because of re-executing - Use CPU_V6K for S3C64XX(ARM1176JZF-s) instead of CPU_V6 * tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C64XX: Select CPU_V6K instead of CPU_V6 ARM: SAMSUNG: if detected device tree skip irq init for S5P Signed-off-by: Olof Johansson --- 9b20d1c9022493b194a88acac0289ff09fedaf92