projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05ac653 021f653)
Merge tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 25 Jul 2014 12:03:22 +0000 (13:03 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 25 Jul 2014 12:03:22 +0000 (13:03 +0100)
* tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux:
  irqchip: gic-v3: Initial support for GICv3
  irqchip: gic: Move some bits of GICv2 to a library-type file

Conflicts:
arch/arm64/Kconfig

1  2 
arch/arm64/Kconfig patch | diff1 | diff2 | blob | history
arch/arm64/kernel/head.S patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/Kconfig
index f4615ba88a77d05b6eb5d8d09d840bfb8622f7ad,be52492c229147f62ee895b2a2aca9f486bdbdfd..bfd60fa9d6d560432626120d43bfbf76f418b319
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -9,7 -9,7 +9,8 @@@ config ARM6
        select ARM_AMBA
        select ARM_ARCH_TIMER
        select ARM_GIC
 +      select AUDIT_ARCH_COMPAT_GENERIC
+       select ARM_GIC_V3
        select BUILDTIME_EXTABLE_SORT
        select CLONE_BACKWARDS
        select COMMON_CLK
diff --cc arch/arm64/kernel/head.S
Simple merge