]> git.karo-electronics.de Git - linux-beck.git/commit
Merge tag 'samsung-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 22:06:14 +0000 (14:06 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 22:06:14 +0000 (14:06 -0800)
commit9b20d1c9022493b194a88acac0289ff09fedaf92
tree9574964fc867bf8af55844c61e133bddbc8afa81
parent4721f3cec17717679397cc57b25fb8c62375cffe
parent70bacadbd07248576290de40cc217c06f0f2d3c3
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 <olof@lixom.net>
arch/arm/Kconfig