From: Olof Johansson <olof@lixom.net>
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-Tag: v3.14-rc1~113^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b20d1c9022493b194a88acac0289ff09fedaf92;p=kernel%2Fkernel-generic.git

Merge tag 'samsung-dev' of git://git./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 <olof@lixom.net>
---

9b20d1c9022493b194a88acac0289ff09fedaf92