Commit bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa
Exists in
master
and in
6 other branches
Merge branch 'misc' into for-linus
Conflicts: arch/arm/mach-integrator/integrator_ap.c
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 146 changed files Side-by-side Diff
- arch/arm/Kconfig
- arch/arm/boot/Makefile
- arch/arm/boot/compressed/Makefile
- arch/arm/common/pl330.c
- arch/arm/configs/integrator_defconfig
- arch/arm/include/asm/Kbuild
- arch/arm/include/asm/auxvec.h
- arch/arm/include/asm/bitsperlong.h
- arch/arm/include/asm/bug.h
- arch/arm/include/asm/cachetype.h
- arch/arm/include/asm/cputime.h
- arch/arm/include/asm/device.h
- arch/arm/include/asm/emergency-restart.h
- arch/arm/include/asm/errno.h
- arch/arm/include/asm/io.h
- arch/arm/include/asm/ioctl.h
- arch/arm/include/asm/irq_regs.h
- arch/arm/include/asm/kdebug.h
- arch/arm/include/asm/local.h
- arch/arm/include/asm/local64.h
- arch/arm/include/asm/mach/arch.h
- arch/arm/include/asm/percpu.h
- arch/arm/include/asm/poll.h
- arch/arm/include/asm/resource.h
- arch/arm/include/asm/sections.h
- arch/arm/include/asm/siginfo.h
- arch/arm/include/asm/sizes.h
- arch/arm/include/asm/system.h
- arch/arm/kernel/armksyms.c
- arch/arm/kernel/debug.S
- arch/arm/kernel/entry-armv.S
- arch/arm/kernel/machine_kexec.c
- arch/arm/kernel/process.c
- arch/arm/kernel/setup.c
- arch/arm/kernel/smp.c
- arch/arm/kernel/traps.c
- arch/arm/kernel/vmlinux.lds.S
- arch/arm/lib/backtrace.S
- arch/arm/lib/div64.S
- arch/arm/mach-at91/Makefile.boot
- arch/arm/mach-bcmring/Makefile.boot
- arch/arm/mach-bcmring/arch.c
- arch/arm/mach-clps711x/Makefile.boot
- arch/arm/mach-clps711x/clep7312.c
- arch/arm/mach-clps711x/edb7211-arch.c
- arch/arm/mach-clps711x/fortunet.c
- arch/arm/mach-clps711x/p720t.c
- arch/arm/mach-cns3xxx/Makefile.boot
- arch/arm/mach-davinci/Makefile.boot
- arch/arm/mach-dove/Makefile.boot
- arch/arm/mach-ebsa110/Makefile.boot
- arch/arm/mach-ep93xx/Makefile.boot
- arch/arm/mach-exynos4/Makefile.boot
- arch/arm/mach-footbridge/Kconfig
- arch/arm/mach-footbridge/Makefile.boot
- arch/arm/mach-footbridge/cats-hw.c
- arch/arm/mach-footbridge/netwinder-hw.c
- arch/arm/mach-gemini/Makefile.boot
- arch/arm/mach-h720x/Makefile.boot
- arch/arm/mach-imx/Makefile.boot
- arch/arm/mach-integrator/Makefile.boot
- arch/arm/mach-integrator/core.c
- arch/arm/mach-integrator/include/mach/platform.h
- arch/arm/mach-integrator/integrator_ap.c
- arch/arm/mach-iop13xx/Makefile.boot
- arch/arm/mach-iop32x/Makefile.boot
- arch/arm/mach-iop33x/Makefile.boot
- arch/arm/mach-ixp2000/Makefile.boot
- arch/arm/mach-ixp23xx/Makefile.boot
- arch/arm/mach-ixp4xx/Makefile.boot
- arch/arm/mach-ixp4xx/common-pci.c
- arch/arm/mach-kirkwood/Makefile.boot
- arch/arm/mach-ks8695/Makefile.boot
- arch/arm/mach-lpc32xx/Makefile.boot
- arch/arm/mach-mmp/Makefile.boot
- arch/arm/mach-mmp/aspenite.c
- arch/arm/mach-mmp/ttc_dkb.c
- arch/arm/mach-msm/Makefile.boot
- arch/arm/mach-msm/board-halibut.c
- arch/arm/mach-msm/board-mahimahi.c
- arch/arm/mach-msm/board-sapphire.c
- arch/arm/mach-msm/board-trout.c
- arch/arm/mach-mv78xx0/Makefile.boot
- arch/arm/mach-mx5/Makefile.boot
- arch/arm/mach-mxs/Makefile.boot
- arch/arm/mach-netx/Makefile.boot
- arch/arm/mach-nomadik/Makefile.boot
- arch/arm/mach-nuc93x/Makefile.boot
- arch/arm/mach-omap1/Makefile.boot
- arch/arm/mach-omap2/Makefile.boot
- arch/arm/mach-orion5x/Makefile.boot
- arch/arm/mach-orion5x/common.c
- arch/arm/mach-orion5x/common.h
- arch/arm/mach-pnx4008/Makefile.boot
- arch/arm/mach-prima2/Makefile.boot
- arch/arm/mach-pxa/Makefile.boot
- arch/arm/mach-pxa/cm-x300.c
- arch/arm/mach-pxa/corgi.c
- arch/arm/mach-pxa/eseries.c
- arch/arm/mach-pxa/eseries.h
- arch/arm/mach-pxa/poodle.c
- arch/arm/mach-pxa/saar.c
- arch/arm/mach-pxa/spitz.c
- arch/arm/mach-pxa/tosa.c
- arch/arm/mach-realview/Makefile.boot
- arch/arm/mach-realview/core.c
- arch/arm/mach-realview/core.h
- arch/arm/mach-realview/include/mach/board-pb1176.h
- arch/arm/mach-realview/realview_pb1176.c
- arch/arm/mach-realview/realview_pbx.c
- arch/arm/mach-rpc/Makefile.boot
- arch/arm/mach-s3c2410/Makefile.boot
- arch/arm/mach-s3c2412/mach-smdk2413.c
- arch/arm/mach-s3c2412/mach-vstms.c
- arch/arm/mach-s3c64xx/Makefile.boot
- arch/arm/mach-s5p64x0/Makefile.boot
- arch/arm/mach-s5pc100/Makefile.boot
- arch/arm/mach-s5pv210/Makefile.boot
- arch/arm/mach-sa1100/Makefile
- arch/arm/mach-sa1100/Makefile.boot
- arch/arm/mach-sa1100/assabet.c
- arch/arm/mach-sa1100/include/mach/simpad.h
- arch/arm/mach-sa1100/leds-simpad.c
- arch/arm/mach-sa1100/leds.c
- arch/arm/mach-sa1100/leds.h
- arch/arm/mach-sa1100/simpad.c
- arch/arm/mach-shark/Makefile.boot
- arch/arm/mach-shmobile/Makefile.boot
- arch/arm/mach-spear3xx/Makefile.boot
- arch/arm/mach-spear6xx/Makefile.boot
- arch/arm/mach-tcc8k/Makefile.boot
- arch/arm/mach-tegra/Makefile.boot
- arch/arm/mach-tegra/board-harmony.c
- arch/arm/mach-tegra/board-paz00.c
- arch/arm/mach-tegra/board-trimslice.c
- arch/arm/mach-u300/Makefile.boot
- arch/arm/mach-ux500/Makefile.boot
- arch/arm/mach-versatile/Makefile.boot
- arch/arm/mach-vexpress/Makefile.boot
- arch/arm/mach-vexpress/hotplug.c
- arch/arm/mach-vt8500/Makefile.boot
- arch/arm/mach-w90x900/Makefile.boot
- arch/arm/mach-zynq/Makefile.boot
- arch/arm/mm/ioremap.c
- arch/arm/tools/mach-types
- drivers/pcmcia/sa1100_simpad.c