Commit 7578634990fb47cc30083fbd812689aa6deacfc0
Exists in
master
and in
7 other branches
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (60 commits) [ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410 [ARM] 4523/1: S3C: Remove FIFO_MAX from uncompression headers [ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h [ARM] 4521/2: S3C: Reorganise VA mapping headers [ARM] 4520/1: S3C: Remove old VA values from static map [ARM] 4519/1: S3C: split S3C2400 values out of S3C24XX map.h [ARM] 4518/1: S3C: Rename watchdog configuration options [ARM] 4517/1: S3C: Fix debug macros for ARM926 output [ARM] 4516/1: S3C: Fix uncompressor serial output for ARM926 [ARM] 4515/1: S3C: Move uncompress code to plat-s3c [ARM] 4514/1: S3C: Rename DEBUG_S3C2410_PORT and DEBUG_S3C_UART [ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT [ARM] 4512/1: S3C: rename the debug macros for per-cpu updates [ARM] 4511/1: S3C: updated LLSERIAL Kconfig defines for CPU support [ARM] 4510/1: S3C: split debug-macro support into plat-s3c [ARM] 4509/1: S3C: Create initial arch/arm/plat-s3c [ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c [ARM] 4461/1: MXC platform and i.MX31ADS core support [ARM] 4507/1: pxa2xx clock_event_device [ARM] 4497/1: Only allow safe cache configurations on ARMv6 and later ...
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 173 changed files Side-by-side Diff
- MAINTAINERS
- arch/arm/Kconfig
- arch/arm/Kconfig.debug
- arch/arm/Makefile
- arch/arm/boot/Makefile
- arch/arm/boot/compressed/Makefile
- arch/arm/boot/compressed/head.S
- arch/arm/configs/em_x270_defconfig
- arch/arm/configs/s3c2410_defconfig
- arch/arm/mach-at91/at91rm9200_devices.c
- arch/arm/mach-iop32x/Kconfig
- arch/arm/mach-iop32x/Makefile
- arch/arm/mach-iop32x/em7210.c
- arch/arm/mach-iop32x/irq.c
- arch/arm/mach-ixp4xx/common.c
- arch/arm/mach-ks8695/irq.c
- arch/arm/mach-mx3/Kconfig
- arch/arm/mach-mx3/Makefile
- arch/arm/mach-mx3/Makefile.boot
- arch/arm/mach-mx3/mm.c
- arch/arm/mach-mx3/mx31ads.c
- arch/arm/mach-mx3/time.c
- arch/arm/mach-ns9xxx/Makefile
- arch/arm/mach-ns9xxx/board-a9m9750dev.c
- arch/arm/mach-ns9xxx/generic.c
- arch/arm/mach-ns9xxx/irq.c
- arch/arm/mach-ns9xxx/mach-cc9p9360js.c
- arch/arm/mach-pxa/Kconfig
- arch/arm/mach-pxa/Makefile
- arch/arm/mach-pxa/devices.h
- arch/arm/mach-pxa/em-x270.c
- arch/arm/mach-pxa/generic.c
- arch/arm/mach-pxa/pm.c
- arch/arm/mach-pxa/pxa25x.c
- arch/arm/mach-pxa/pxa27x.c
- arch/arm/mach-pxa/sleep.S
- arch/arm/mach-pxa/time.c
- arch/arm/mach-rpc/riscpc.c
- arch/arm/mach-s3c2410/Kconfig
- arch/arm/mach-s3c2410/clock.c
- arch/arm/mach-s3c2410/dma.c
- arch/arm/mach-s3c2410/mach-amlm5900.c
- arch/arm/mach-s3c2410/mach-bast.c
- arch/arm/mach-s3c2410/mach-h1940.c
- arch/arm/mach-s3c2410/mach-n30.c
- arch/arm/mach-s3c2410/mach-otom.c
- arch/arm/mach-s3c2410/mach-qt2410.c
- arch/arm/mach-s3c2410/mach-smdk2410.c
- arch/arm/mach-s3c2410/mach-vr1000.c
- arch/arm/mach-s3c2410/s3c2410.c
- arch/arm/mach-s3c2410/sleep.S
- arch/arm/mach-s3c2412/Kconfig
- arch/arm/mach-s3c2412/clock.c
- arch/arm/mach-s3c2412/dma.c
- arch/arm/mach-s3c2412/mach-smdk2413.c
- arch/arm/mach-s3c2412/mach-vstms.c
- arch/arm/mach-s3c2412/s3c2412.c
- arch/arm/mach-s3c2440/Kconfig
- arch/arm/mach-s3c2440/dma.c
- arch/arm/mach-s3c2440/mach-anubis.c
- arch/arm/mach-s3c2440/mach-nexcoder.c
- arch/arm/mach-s3c2440/mach-osiris.c
- arch/arm/mach-s3c2440/mach-rx3715.c
- arch/arm/mach-s3c2440/mach-smdk2440.c
- arch/arm/mach-s3c2442/Kconfig
- arch/arm/mach-s3c2443/Kconfig
- arch/arm/mach-s3c2443/dma.c
- arch/arm/mach-s3c2443/mach-smdk2443.c
- arch/arm/mach-sa1100/Kconfig
- arch/arm/mach-sa1100/Makefile
- arch/arm/mach-sa1100/jornada720_ssp.c
- arch/arm/mach-sa1100/neponset.c
- arch/arm/mm/Kconfig
- arch/arm/mm/cache-l2x0.c
- arch/arm/mm/mmu.c
- arch/arm/mm/proc-syms.c
- arch/arm/mm/proc-v7.S
- arch/arm/plat-iop/time.c
- arch/arm/plat-mxc/Kconfig
- arch/arm/plat-mxc/Makefile
- arch/arm/plat-mxc/irq.c
- arch/arm/plat-s3c/Kconfig
- arch/arm/plat-s3c24xx/Kconfig
- arch/arm/plat-s3c24xx/common-smdk.c
- arch/arm/plat-s3c24xx/cpu.c
- arch/arm/plat-s3c24xx/devs.c
- arch/arm/plat-s3c24xx/pm.c
- arch/arm/plat-s3c24xx/s3c244x.c
- arch/arm/plat-s3c24xx/sleep.S
- arch/arm/plat-s3c24xx/time.c
- arch/arm/vfp/vfphw.S
- arch/arm/vfp/vfpmodule.c
- drivers/char/watchdog/Kconfig
- drivers/char/watchdog/Makefile
- drivers/char/watchdog/iop_wdt.c
- drivers/net/arm/ether1.c
- drivers/net/arm/ether3.c
- drivers/net/arm/etherh.c
- drivers/scsi/arm/cumana_1.c
- drivers/scsi/arm/ecoscsi.c
- drivers/scsi/arm/oak.c
- drivers/serial/imx.c
- drivers/serial/s3c2410.c
- include/asm-arm/arch-at91/at91_mci.h
- include/asm-arm/arch-iop13xx/iop13xx.h
- include/asm-arm/arch-iop13xx/system.h
- include/asm-arm/arch-iop13xx/uncompress.h
- include/asm-arm/arch-iop32x/uncompress.h
- include/asm-arm/arch-mxc/board-mx31ads.h
- include/asm-arm/arch-mxc/common.h
- include/asm-arm/arch-mxc/dma.h
- include/asm-arm/arch-mxc/entry-macro.S
- include/asm-arm/arch-mxc/hardware.h
- include/asm-arm/arch-mxc/io.h
- include/asm-arm/arch-mxc/irqs.h
- include/asm-arm/arch-mxc/memory.h
- include/asm-arm/arch-mxc/mx31.h
- include/asm-arm/arch-mxc/mxc.h
- include/asm-arm/arch-mxc/system.h
- include/asm-arm/arch-mxc/timex.h
- include/asm-arm/arch-mxc/uncompress.h
- include/asm-arm/arch-mxc/vmalloc.h
- include/asm-arm/arch-ns9xxx/regs-bbu.h
- include/asm-arm/arch-ns9xxx/regs-mem.h
- include/asm-arm/arch-ns9xxx/regs-sys.h
- include/asm-arm/arch-pxa/pm.h
- include/asm-arm/arch-s3c2400/map.h
- include/asm-arm/arch-s3c2400/memory.h
- include/asm-arm/arch-s3c2410/debug-macro.S
- include/asm-arm/arch-s3c2410/iic.h
- include/asm-arm/arch-s3c2410/map.h
- include/asm-arm/arch-s3c2410/memory.h
- include/asm-arm/arch-s3c2410/nand.h
- include/asm-arm/arch-s3c2410/regs-ac97.h
- include/asm-arm/arch-s3c2410/regs-adc.h
- include/asm-arm/arch-s3c2410/regs-iic.h
- include/asm-arm/arch-s3c2410/regs-iis.h
- include/asm-arm/arch-s3c2410/regs-lcd.h
- include/asm-arm/arch-s3c2410/regs-nand.h
- include/asm-arm/arch-s3c2410/regs-rtc.h
- include/asm-arm/arch-s3c2410/regs-serial.h
- include/asm-arm/arch-s3c2410/regs-spi.h
- include/asm-arm/arch-s3c2410/regs-timer.h
- include/asm-arm/arch-s3c2410/regs-udc.h
- include/asm-arm/arch-s3c2410/regs-watchdog.h
- include/asm-arm/arch-s3c2410/system.h
- include/asm-arm/arch-s3c2410/udc.h
- include/asm-arm/arch-s3c2410/uncompress.h
- include/asm-arm/arch-sa1100/jornada720.h
- include/asm-arm/elf.h
- include/asm-arm/floppy.h
- include/asm-arm/hardware/iop3xx.h
- include/asm-arm/pgtable-nommu.h
- include/asm-arm/plat-s3c/debug-macro.S
- include/asm-arm/plat-s3c/iic.h
- include/asm-arm/plat-s3c/map.h
- include/asm-arm/plat-s3c/nand.h
- include/asm-arm/plat-s3c/regs-ac97.h
- include/asm-arm/plat-s3c/regs-adc.h
- include/asm-arm/plat-s3c/regs-iic.h
- include/asm-arm/plat-s3c/regs-nand.h
- include/asm-arm/plat-s3c/regs-rtc.h
- include/asm-arm/plat-s3c/regs-serial.h
- include/asm-arm/plat-s3c/regs-timer.h
- include/asm-arm/plat-s3c/regs-watchdog.h
- include/asm-arm/plat-s3c/uncompress.h
- include/asm-arm/plat-s3c24xx/regs-iis.h
- include/asm-arm/plat-s3c24xx/regs-spi.h
- include/asm-arm/plat-s3c24xx/regs-udc.h
- include/asm-arm/plat-s3c24xx/udc.h
- include/asm-arm/thread_info.h
- include/asm-arm/unistd.h
- include/asm-arm/vfp.h