Commit 3ad55155b222f2a901405dea20ff7c68828ecd92
Exists in
master
and in
20 other branches
Merge branch 'devel-stable' into for-next
Conflicts: arch/arm/kernel/entry-armv.S
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.
Showing 107 changed files Side-by-side Diff
- Documentation/arm/kernel_user_helpers.txt
- arch/arm/Kconfig
- arch/arm/include/asm/assembler.h
- arch/arm/include/asm/dma.h
- arch/arm/include/asm/hwcap.h
- arch/arm/include/asm/kprobes.h
- arch/arm/include/asm/mach/arch.h
- arch/arm/include/asm/perf_event.h
- arch/arm/include/asm/ptrace.h
- arch/arm/kernel/Makefile
- arch/arm/kernel/entry-armv.S
- arch/arm/kernel/entry-header.S
- arch/arm/kernel/kprobes-arm.c
- arch/arm/kernel/kprobes-common.c
- arch/arm/kernel/kprobes-decode.c
- arch/arm/kernel/kprobes-thumb.c
- arch/arm/kernel/kprobes.c
- arch/arm/kernel/kprobes.h
- arch/arm/kernel/perf_event.c
- arch/arm/kernel/perf_event_v7.c
- arch/arm/kernel/ptrace.c
- arch/arm/kernel/setup.c
- arch/arm/kernel/traps.c
- arch/arm/mach-davinci/board-da830-evm.c
- arch/arm/mach-davinci/board-da850-evm.c
- arch/arm/mach-davinci/board-dm355-evm.c
- arch/arm/mach-davinci/board-dm355-leopard.c
- arch/arm/mach-davinci/board-dm365-evm.c
- arch/arm/mach-davinci/board-dm644x-evm.c
- arch/arm/mach-davinci/board-dm646x-evm.c
- arch/arm/mach-davinci/board-mityomapl138.c
- arch/arm/mach-davinci/board-neuros-osd2.c
- arch/arm/mach-davinci/board-omapl138-hawk.c
- arch/arm/mach-davinci/board-sffsdr.c
- arch/arm/mach-davinci/board-tnetv107x-evm.c
- arch/arm/mach-davinci/include/mach/memory.h
- arch/arm/mach-h720x/h7201-eval.c
- arch/arm/mach-h720x/h7202-eval.c
- arch/arm/mach-h720x/include/mach/memory.h
- arch/arm/mach-ixp4xx/avila-setup.c
- arch/arm/mach-ixp4xx/coyote-setup.c
- arch/arm/mach-ixp4xx/dsmg600-setup.c
- arch/arm/mach-ixp4xx/fsg-setup.c
- arch/arm/mach-ixp4xx/gateway7001-setup.c
- arch/arm/mach-ixp4xx/goramo_mlr.c
- arch/arm/mach-ixp4xx/gtwx5715-setup.c
- arch/arm/mach-ixp4xx/include/mach/memory.h
- arch/arm/mach-ixp4xx/ixdp425-setup.c
- arch/arm/mach-ixp4xx/nas100d-setup.c
- arch/arm/mach-ixp4xx/nslu2-setup.c
- arch/arm/mach-ixp4xx/vulcan-setup.c
- arch/arm/mach-ixp4xx/wg302v2-setup.c
- arch/arm/mach-pxa/cm-x2xx.c
- arch/arm/mach-pxa/include/mach/memory.h
- arch/arm/mach-realview/include/mach/memory.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-sa1100/assabet.c
- arch/arm/mach-sa1100/badge4.c
- arch/arm/mach-sa1100/include/mach/memory.h
- arch/arm/mach-sa1100/jornada720.c
- arch/arm/mach-shark/core.c
- arch/arm/mach-shark/include/mach/memory.h
- arch/arm/mm/cache-fa.S
- arch/arm/mm/cache-v3.S
- arch/arm/mm/cache-v4.S
- arch/arm/mm/cache-v4wb.S
- arch/arm/mm/cache-v4wt.S
- arch/arm/mm/cache-v6.S
- arch/arm/mm/cache-v7.S
- arch/arm/mm/init.c
- arch/arm/mm/proc-arm1020.S
- arch/arm/mm/proc-arm1020e.S
- arch/arm/mm/proc-arm1022.S
- arch/arm/mm/proc-arm1026.S
- arch/arm/mm/proc-arm6_7.S
- arch/arm/mm/proc-arm720.S
- arch/arm/mm/proc-arm740.S
- arch/arm/mm/proc-arm7tdmi.S
- arch/arm/mm/proc-arm920.S
- arch/arm/mm/proc-arm922.S
- arch/arm/mm/proc-arm925.S
- arch/arm/mm/proc-arm926.S
- arch/arm/mm/proc-arm940.S
- arch/arm/mm/proc-arm946.S
- arch/arm/mm/proc-arm9tdmi.S
- arch/arm/mm/proc-fa526.S
- arch/arm/mm/proc-feroceon.S
- arch/arm/mm/proc-macros.S
- arch/arm/mm/proc-mohawk.S
- arch/arm/mm/proc-sa110.S
- arch/arm/mm/proc-sa1100.S
- arch/arm/mm/proc-v6.S
- arch/arm/mm/proc-v7.S
- arch/arm/mm/proc-xsc3.S
- arch/arm/mm/proc-xscale.S
- arch/arm/mm/tlb-fa.S
- arch/arm/mm/tlb-v3.S
- arch/arm/mm/tlb-v4.S
- arch/arm/mm/tlb-v4wb.S
- arch/arm/mm/tlb-v4wbi.S
- arch/arm/mm/tlb-v6.S
- arch/arm/mm/tlb-v7.S
- arch/arm/vfp/vfpmodule.c