diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 10:39:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 10:39:02 -0700 |
| commit | 7e31aa11fc672bbe0dd0da59513c9efe3809ced7 (patch) | |
| tree | 0aafe6a0045230950ce6b26579a053da12614a49 | |
| parent | 071f4924844c435a3ae0cdbab7d7df2f1da85713 (diff) | |
| parent | 9cb7117fa4858468014f76bd996076985111e955 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5182/1: pxa: Fix pcm990 compilation
[ARM] Fix explicit asm(-arm)?/arch-foo references
[ARM] move include/asm-arm to arch/arm/include/asm
[ARM] Remove explicit dependency for misc.o from compressed/Makefile
[ARM] initrd: claim initrd memory exclusively
[ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
[ARM] add Sascha Hauer as Freescale i.MX Maintainer
[ARM] i.MX: add missing clock functions exports
[ARM] i.MX: remove set_imx_fb_info() export
[ARM] mx1ads: make mmc platform data available for modules
[ARM] mx2: add missing Kconfig dependency
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/Kbuild (renamed from include/asm-arm/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/a.out-core.h (renamed from include/asm-arm/a.out-core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/a.out.h (renamed from include/asm-arm/a.out.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/assembler.h (renamed from include/asm-arm/assembler.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/atomic.h (renamed from include/asm-arm/atomic.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/auxvec.h (renamed from include/asm-arm/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/bitops.h (renamed from include/asm-arm/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/bug.h (renamed from include/asm-arm/bug.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/bugs.h (renamed from include/asm-arm/bugs.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/byteorder.h (renamed from include/asm-arm/byteorder.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/cache.h (renamed from include/asm-arm/cache.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/cacheflush.h (renamed from include/asm-arm/cacheflush.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/checksum.h (renamed from include/asm-arm/checksum.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/cnt32_to_63.h (renamed from include/asm-arm/cnt32_to_63.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/cpu-multi32.h (renamed from include/asm-arm/cpu-multi32.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/cpu-single.h (renamed from include/asm-arm/cpu-single.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/cpu.h (renamed from include/asm-arm/cpu.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/cputime.h (renamed from include/asm-arm/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/current.h (renamed from include/asm-arm/current.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/delay.h (renamed from include/asm-arm/delay.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/device.h (renamed from include/asm-arm/device.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/div64.h (renamed from include/asm-arm/div64.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h (renamed from include/asm-arm/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/dma.h (renamed from include/asm-arm/dma.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/domain.h (renamed from include/asm-arm/domain.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/ecard.h (renamed from include/asm-arm/ecard.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/elf.h (renamed from include/asm-arm/elf.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/emergency-restart.h (renamed from include/asm-arm/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/errno.h (renamed from include/asm-arm/errno.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/fb.h (renamed from include/asm-arm/fb.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/fcntl.h (renamed from include/asm-arm/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/fiq.h (renamed from include/asm-arm/fiq.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/flat.h (renamed from include/asm-arm/flat.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/floppy.h (renamed from include/asm-arm/floppy.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/fpstate.h (renamed from include/asm-arm/fpstate.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/ftrace.h (renamed from include/asm-arm/ftrace.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/futex.h (renamed from include/asm-arm/futex.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/glue.h (renamed from include/asm-arm/glue.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/gpio.h (renamed from include/asm-arm/gpio.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardirq.h (renamed from include/asm-arm/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware.h (renamed from include/asm-arm/hardware.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/arm_timer.h (renamed from include/asm-arm/hardware/arm_timer.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/arm_twd.h (renamed from include/asm-arm/hardware/arm_twd.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/cache-l2x0.h (renamed from include/asm-arm/hardware/cache-l2x0.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/clps7111.h (renamed from include/asm-arm/hardware/clps7111.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/cs89712.h (renamed from include/asm-arm/hardware/cs89712.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/debug-8250.S (renamed from include/asm-arm/hardware/debug-8250.S) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/debug-pl01x.S (renamed from include/asm-arm/hardware/debug-pl01x.S) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/dec21285.h (renamed from include/asm-arm/hardware/dec21285.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/entry-macro-iomd.S (renamed from include/asm-arm/hardware/entry-macro-iomd.S) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/ep7211.h (renamed from include/asm-arm/hardware/ep7211.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/ep7212.h (renamed from include/asm-arm/hardware/ep7212.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/gic.h (renamed from include/asm-arm/hardware/gic.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/icst307.h (renamed from include/asm-arm/hardware/icst307.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/icst525.h (renamed from include/asm-arm/hardware/icst525.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/ioc.h (renamed from include/asm-arm/hardware/ioc.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/iomd.h (renamed from include/asm-arm/hardware/iomd.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/iop3xx-adma.h (renamed from include/asm-arm/hardware/iop3xx-adma.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/iop3xx-gpio.h (renamed from include/asm-arm/hardware/iop3xx-gpio.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/iop3xx.h (renamed from include/asm-arm/hardware/iop3xx.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/iop_adma.h (renamed from include/asm-arm/hardware/iop_adma.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/it8152.h (renamed from include/asm-arm/hardware/it8152.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/linkup-l1110.h (renamed from include/asm-arm/hardware/linkup-l1110.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/locomo.h (renamed from include/asm-arm/hardware/locomo.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/memc.h (renamed from include/asm-arm/hardware/memc.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/pci_v3.h (renamed from include/asm-arm/hardware/pci_v3.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/sa1111.h (renamed from include/asm-arm/hardware/sa1111.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/scoop.h (renamed from include/asm-arm/hardware/scoop.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/sharpsl_pm.h (renamed from include/asm-arm/hardware/sharpsl_pm.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/ssp.h (renamed from include/asm-arm/hardware/ssp.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/uengine.h (renamed from include/asm-arm/hardware/uengine.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/vic.h (renamed from include/asm-arm/hardware/vic.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/hw_irq.h (renamed from include/asm-arm/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/hwcap.h (renamed from include/asm-arm/hwcap.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/ide.h (renamed from include/asm-arm/ide.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/io.h (renamed from include/asm-arm/io.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/ioctl.h (renamed from include/asm-arm/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/ioctls.h (renamed from include/asm-arm/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/ipcbuf.h (renamed from include/asm-arm/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/irq.h (renamed from include/asm-arm/irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/irq_regs.h (renamed from include/asm-arm/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/irqflags.h (renamed from include/asm-arm/irqflags.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/kdebug.h (renamed from include/asm-arm/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/kexec.h (renamed from include/asm-arm/kexec.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/kgdb.h (renamed from include/asm-arm/kgdb.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/kmap_types.h (renamed from include/asm-arm/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/kprobes.h (renamed from include/asm-arm/kprobes.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/leds.h (renamed from include/asm-arm/leds.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/limits.h (renamed from include/asm-arm/limits.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/linkage.h (renamed from include/asm-arm/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/local.h (renamed from include/asm-arm/local.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/locks.h (renamed from include/asm-arm/locks.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/arch.h (renamed from include/asm-arm/mach/arch.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/dma.h (renamed from include/asm-arm/mach/dma.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/flash.h (renamed from include/asm-arm/mach/flash.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/irda.h (renamed from include/asm-arm/mach/irda.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/irq.h (renamed from include/asm-arm/mach/irq.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/map.h (renamed from include/asm-arm/mach/map.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/mmc.h (renamed from include/asm-arm/mach/mmc.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/pci.h (renamed from include/asm-arm/mach/pci.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/serial_at91.h (renamed from include/asm-arm/mach/serial_at91.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/serial_sa1100.h (renamed from include/asm-arm/mach/serial_sa1100.h) | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/sharpsl_param.h (renamed from include/asm-arm/mach/sharpsl_param.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/time.h (renamed from include/asm-arm/mach/time.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/udc_pxa2xx.h (renamed from include/asm-arm/mach/udc_pxa2xx.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mc146818rtc.h (renamed from include/asm-arm/mc146818rtc.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/memory.h (renamed from include/asm-arm/memory.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mman.h (renamed from include/asm-arm/mman.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/mmu.h (renamed from include/asm-arm/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/mmu_context.h (renamed from include/asm-arm/mmu_context.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mmzone.h (renamed from include/asm-arm/mmzone.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/module.h (renamed from include/asm-arm/module.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/msgbuf.h (renamed from include/asm-arm/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/mtd-xip.h (renamed from include/asm-arm/mtd-xip.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/mutex.h (renamed from include/asm-arm/mutex.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/nwflash.h (renamed from include/asm-arm/nwflash.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/page-nommu.h (renamed from include/asm-arm/page-nommu.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/page.h (renamed from include/asm-arm/page.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/param.h (renamed from include/asm-arm/param.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/parport.h (renamed from include/asm-arm/parport.h) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/pci.h (renamed from include/asm-arm/pci.h) | 0 | ||||
| -rw-r--r-- | arch/arm/include/asm/percpu.h (renamed from include/asm-arm/percpu.h) | 0 |