Commit b0df89868006517417251e02cc4ce5d4b0165885
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
Merge branch 'devel-stable' into for-linus
Conflicts: arch/arm/Kconfig.debug arch/arm/plat-versatile/Kconfig Merge fixes: arch/arm/mach-integrator/Kconfig drivers/clocksource/Kconfig
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 235 changed files Side-by-side Diff
- arch/arm/Kconfig
- arch/arm/Kconfig.debug
- arch/arm/include/asm/hardware/it8152.h
- arch/arm/include/asm/irq.h
- arch/arm/include/asm/mc146818rtc.h
- arch/arm/include/asm/system.h
- arch/arm/kernel/Makefile
- arch/arm/kernel/process.c
- arch/arm/kernel/time.c
- arch/arm/mach-at91/at91cap9.c
- arch/arm/mach-at91/at91rm9200.c
- arch/arm/mach-at91/at91sam9260.c
- arch/arm/mach-at91/at91sam9261.c
- arch/arm/mach-at91/at91sam9263.c
- arch/arm/mach-at91/at91sam9g45.c
- arch/arm/mach-at91/at91sam9rl.c
- arch/arm/mach-at91/at91x40.c
- arch/arm/mach-at91/include/mach/system.h
- arch/arm/mach-bcmring/core.c
- arch/arm/mach-bcmring/include/mach/system.h
- arch/arm/mach-clps711x/common.c
- arch/arm/mach-clps711x/include/mach/system.h
- arch/arm/mach-cns3xxx/include/mach/system.h
- arch/arm/mach-davinci/include/mach/system.h
- arch/arm/mach-davinci/time.c
- arch/arm/mach-dove/include/mach/system.h
- arch/arm/mach-ebsa110/core.c
- arch/arm/mach-ebsa110/include/mach/system.h
- arch/arm/mach-ep93xx/core.c
- arch/arm/mach-ep93xx/include/mach/system.h
- arch/arm/mach-exynos/common.c
- arch/arm/mach-exynos/dma.c
- arch/arm/mach-exynos/include/mach/system.h
- arch/arm/mach-footbridge/include/mach/system.h
- arch/arm/mach-gemini/Makefile
- arch/arm/mach-gemini/idle.c
- arch/arm/mach-gemini/include/mach/system.h
- arch/arm/mach-gemini/irq.c
- arch/arm/mach-h720x/common.c
- arch/arm/mach-h720x/include/mach/system.h
- arch/arm/mach-highbank/highbank.c
- arch/arm/mach-highbank/include/mach/irqs.h
- arch/arm/mach-highbank/include/mach/system.h
- arch/arm/mach-imx/mm-imx3.c
- arch/arm/mach-imx/pm-imx27.c
- arch/arm/mach-integrator/Kconfig
- arch/arm/mach-integrator/core.c
- arch/arm/mach-integrator/impd1.c
- arch/arm/mach-integrator/include/mach/system.h
- arch/arm/mach-integrator/integrator_cp.c
- arch/arm/mach-iop13xx/include/mach/system.h
- arch/arm/mach-iop32x/include/mach/system.h
- arch/arm/mach-iop33x/include/mach/system.h
- arch/arm/mach-ixp2000/include/mach/system.h
- arch/arm/mach-ixp23xx/core.c
- arch/arm/mach-ixp23xx/include/mach/system.h
- arch/arm/mach-ixp4xx/common.c
- arch/arm/mach-ixp4xx/include/mach/system.h
- arch/arm/mach-kirkwood/include/mach/system.h
- arch/arm/mach-ks8695/include/mach/system.h
- arch/arm/mach-lpc32xx/include/mach/system.h
- arch/arm/mach-lpc32xx/phy3250.c
- arch/arm/mach-mmp/aspenite.c
- arch/arm/mach-mmp/avengers_lite.c
- arch/arm/mach-mmp/brownstone.c
- arch/arm/mach-mmp/flint.c
- arch/arm/mach-mmp/gplugd.c
- arch/arm/mach-mmp/include/mach/irqs.h
- arch/arm/mach-mmp/include/mach/system.h
- arch/arm/mach-mmp/irq-mmp2.c
- arch/arm/mach-mmp/jasper.c
- arch/arm/mach-mmp/tavorevb.c
- arch/arm/mach-mmp/teton_bga.c
- arch/arm/mach-mmp/ttc_dkb.c
- arch/arm/mach-msm/idle.S
- arch/arm/mach-msm/idle.c
- arch/arm/mach-msm/include/mach/system.h
- arch/arm/mach-msm/timer.c
- arch/arm/mach-mv78xx0/include/mach/system.h
- arch/arm/mach-mx5/mm.c
- arch/arm/mach-mxs/devices.c
- arch/arm/mach-mxs/devices/amba-duart.c
- arch/arm/mach-mxs/include/mach/system.h
- arch/arm/mach-mxs/pm.c
- arch/arm/mach-netx/fb.c
- arch/arm/mach-netx/include/mach/system.h
- arch/arm/mach-nomadik/board-nhk8815.c
- arch/arm/mach-nomadik/cpu-8815.c
- arch/arm/mach-nomadik/include/mach/system.h
- arch/arm/mach-omap1/include/mach/system.h
- arch/arm/mach-omap1/pm.c
- arch/arm/mach-omap2/emu.c
- arch/arm/mach-omap2/include/mach/system.h
- arch/arm/mach-omap2/pm24xx.c
- arch/arm/mach-omap2/pm34xx.c
- arch/arm/mach-omap2/pm44xx.c
- arch/arm/mach-omap2/prm_common.c
- arch/arm/mach-orion5x/include/mach/system.h
- arch/arm/mach-picoxcell/include/mach/irqs.h
- arch/arm/mach-picoxcell/include/mach/system.h
- arch/arm/mach-pnx4008/include/mach/system.h
- arch/arm/mach-prima2/include/mach/system.h
- arch/arm/mach-prima2/timer.c
- arch/arm/mach-pxa/capc7117.c
- arch/arm/mach-pxa/cm-x300.c
- arch/arm/mach-pxa/colibri-pxa270.c
- arch/arm/mach-pxa/colibri-pxa300.c
- arch/arm/mach-pxa/colibri-pxa320.c
- arch/arm/mach-pxa/corgi.c
- arch/arm/mach-pxa/csb726.c
- arch/arm/mach-pxa/devices.c
- arch/arm/mach-pxa/em-x270.c
- arch/arm/mach-pxa/gumstix.c
- arch/arm/mach-pxa/h5000.c
- arch/arm/mach-pxa/himalaya.c
- arch/arm/mach-pxa/icontrol.c
- arch/arm/mach-pxa/idp.c
- arch/arm/mach-pxa/include/mach/irqs.h
- arch/arm/mach-pxa/include/mach/mainstone.h
- arch/arm/mach-pxa/include/mach/system.h
- arch/arm/mach-pxa/mioa701.c
- arch/arm/mach-pxa/mp900.c
- arch/arm/mach-pxa/palmld.c
- arch/arm/mach-pxa/palmt5.c
- arch/arm/mach-pxa/palmtc.c
- arch/arm/mach-pxa/palmte2.c
- arch/arm/mach-pxa/palmtreo.c
- arch/arm/mach-pxa/palmtx.c
- arch/arm/mach-pxa/palmz72.c
- arch/arm/mach-pxa/pxa3xx.c
- arch/arm/mach-pxa/raumfeld.c
- arch/arm/mach-pxa/saar.c
- arch/arm/mach-pxa/spitz.c
- arch/arm/mach-pxa/stargate2.c
- arch/arm/mach-pxa/tavorevb.c
- arch/arm/mach-pxa/time.c
- arch/arm/mach-pxa/trizeps4.c
- arch/arm/mach-pxa/viper.c
- arch/arm/mach-pxa/vpac270.c
- arch/arm/mach-pxa/xcep.c
- arch/arm/mach-pxa/z2.c
- arch/arm/mach-realview/core.h
- arch/arm/mach-realview/include/mach/irqs-pb1176.h
- arch/arm/mach-realview/include/mach/system.h
- arch/arm/mach-realview/realview_eb.c
- arch/arm/mach-realview/realview_pb1176.c
- arch/arm/mach-realview/realview_pb11mp.c
- arch/arm/mach-realview/realview_pba8.c
- arch/arm/mach-realview/realview_pbx.c
- arch/arm/mach-rpc/include/mach/system.h
- arch/arm/mach-s3c2410/include/mach/system.h
- arch/arm/mach-s3c2412/s3c2412.c
- arch/arm/mach-s3c2416/s3c2416.c
- arch/arm/mach-s3c64xx/include/mach/system.h
- arch/arm/mach-s5p64x0/common.c
- arch/arm/mach-s5p64x0/dma.c
- arch/arm/mach-s5p64x0/include/mach/system.h
- arch/arm/mach-s5pc100/common.c
- arch/arm/mach-s5pc100/dma.c
- arch/arm/mach-s5pc100/include/mach/system.h
- arch/arm/mach-s5pv210/common.c
- arch/arm/mach-s5pv210/dma.c
- arch/arm/mach-s5pv210/include/mach/system.h
- arch/arm/mach-sa1100/include/mach/system.h
- arch/arm/mach-shark/core.c
- arch/arm/mach-shark/include/mach/system.h
- arch/arm/mach-shmobile/Kconfig
- arch/arm/mach-shmobile/board-ag5evm.c
- arch/arm/mach-shmobile/board-bonito.c
- arch/arm/mach-shmobile/board-g3evm.c
- arch/arm/mach-shmobile/board-g4evm.c
- arch/arm/mach-shmobile/board-kota2.c
- arch/arm/mach-shmobile/board-mackerel.c
- arch/arm/mach-shmobile/board-marzen.c
- arch/arm/mach-shmobile/include/mach/irqs.h
- arch/arm/mach-shmobile/include/mach/system.h
- arch/arm/mach-shmobile/intc-r8a7740.c
- arch/arm/mach-shmobile/intc-sh7367.c
- arch/arm/mach-shmobile/intc-sh7372.c
- arch/arm/mach-shmobile/intc-sh7377.c
- arch/arm/mach-shmobile/intc-sh73a0.c
- arch/arm/mach-shmobile/setup-r8a7740.c
- arch/arm/mach-shmobile/setup-r8a7779.c
- arch/arm/mach-shmobile/setup-sh7367.c
- arch/arm/mach-shmobile/setup-sh7372.c
- arch/arm/mach-shmobile/setup-sh7377.c
- arch/arm/mach-shmobile/setup-sh73a0.c
- arch/arm/mach-spear3xx/include/mach/system.h
- arch/arm/mach-spear3xx/spear300.c
- arch/arm/mach-spear3xx/spear3xx.c
- arch/arm/mach-spear6xx/include/mach/system.h
- arch/arm/mach-spear6xx/spear6xx.c
- arch/arm/mach-tegra/common.c
- arch/arm/mach-tegra/include/mach/system.h
- arch/arm/mach-u300/core.c
- arch/arm/mach-u300/include/mach/system.h
- arch/arm/mach-ux500/devices-common.c
- arch/arm/mach-ux500/include/mach/system.h
- arch/arm/mach-versatile/core.c
- arch/arm/mach-versatile/core.h
- arch/arm/mach-versatile/include/mach/system.h
- arch/arm/mach-versatile/versatile_pb.c
- arch/arm/mach-vexpress/core.h
- arch/arm/mach-vexpress/ct-ca9x4.c
- arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
- arch/arm/mach-vexpress/include/mach/system.h
- arch/arm/mach-vexpress/v2m.c
- arch/arm/mach-vt8500/include/mach/system.h
- arch/arm/mach-w90x900/dev.c
- arch/arm/mach-w90x900/include/mach/system.h
- arch/arm/mach-zynq/include/mach/system.h
- arch/arm/plat-mxc/include/mach/system.h
- arch/arm/plat-nomadik/Kconfig
- arch/arm/plat-omap/include/plat/system.h
- arch/arm/plat-s3c24xx/cpu.c
- arch/arm/plat-spear/include/plat/system.h
- arch/arm/plat-versatile/Kconfig
- arch/c6x/Kconfig
- arch/powerpc/Kconfig
- arch/sh/Kconfig
- arch/sh/include/asm/irq.h
- arch/x86/Kconfig
- drivers/amba/bus.c
- drivers/clocksource/Kconfig
- drivers/gpio/gpio-pxa.c
- drivers/mmc/host/mmci.c
- drivers/of/platform.c
- drivers/sh/intc/balancing.c
- drivers/sh/intc/core.c
- drivers/sh/intc/handle.c
- drivers/sh/intc/virq.c
- include/linux/amba/bus.h
- include/linux/sh_intc.h
- kernel/irq/Kconfig
- sound/arm/pxa2xx-ac97-lib.c