Merge remote-tracking branch 'samsung-krzk/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/exynos/exynos7.dtsi
index 162831546e183d192459fee3ae40df1b6bf2929d,8d7ce97c0ddbb67461e24f1bebacd8fb9d3acc40..6328a66ed97e42ae744d2553121e2791d3f11781
--- 1/arch/arm64/boot/dts/exynos/exynos7.dtsi
--- 2/arch/arm64/boot/dts/exynos/exynos7.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos7.dtsi
@@@ -473,10 -474,14 +474,14 @@@
  
                timer {
                        compatible = "arm,armv8-timer";
-                       interrupts = <1 13 0xff08>,
-                                    <1 14 0xff08>,
-                                    <1 11 0xff08>,
-                                    <1 10 0xff08>;
+                       interrupts = <GIC_PPI 13
 -                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,
++                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+                                    <GIC_PPI 14
 -                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,
++                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+                                    <GIC_PPI 11
 -                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,
++                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+                                    <GIC_PPI 10
 -                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>;
++                                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
                };
  
                pmu_system_controller: system-controller@105c0000 {