Merge branch 'dt/gic' into next/dt
Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c
No related branches found
No related tags found
Showing
- arch/arm/vfp/vfpmodule.c 22 additions, 9 deletionsarch/arm/vfp/vfpmodule.c
- drivers/of/irq.c 107 additions, 0 deletionsdrivers/of/irq.c
- drivers/usb/musb/musb_debugfs.c 0 additions, 6 deletionsdrivers/usb/musb/musb_debugfs.c
- include/linux/cpu_pm.h 109 additions, 0 deletionsinclude/linux/cpu_pm.h
- include/linux/interrupt.h 27 additions, 11 deletionsinclude/linux/interrupt.h
- include/linux/irq.h 17 additions, 1 deletioninclude/linux/irq.h
- include/linux/irqdesc.h 1 addition, 0 deletionsinclude/linux/irqdesc.h
- include/linux/irqdomain.h 15 additions, 1 deletioninclude/linux/irqdomain.h
- include/linux/of_irq.h 3 additions, 0 deletionsinclude/linux/of_irq.h
- kernel/Makefile 1 addition, 0 deletionskernel/Makefile
- kernel/cpu_pm.c 233 additions, 0 deletionskernel/cpu_pm.c
- kernel/events/core.c 2 additions, 2 deletionskernel/events/core.c
- kernel/irq/chip.c 57 additions, 7 deletionskernel/irq/chip.c
- kernel/irq/internals.h 14 additions, 5 deletionskernel/irq/internals.h
- kernel/irq/irqdesc.c 31 additions, 1 deletionkernel/irq/irqdesc.c
- kernel/irq/irqdomain.c 6 additions, 6 deletionskernel/irq/irqdomain.c
- kernel/irq/manage.c 209 additions, 9 deletionskernel/irq/manage.c
- kernel/irq/settings.h 7 additions, 0 deletionskernel/irq/settings.h
- kernel/power/Kconfig 4 additions, 0 deletionskernel/power/Kconfig
Loading
Please register or sign in to comment