Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (38 commits) [ARM] 5191/1: ARM: remove CVS keywords [ARM] pxafb: fix the warning of incorrect lccr when lcd_conn is specified [ARM] pxafb: add flag to specify output format on LDD pins when base is RGBT16 [ARM] pxafb: fix the incorrect configuration of GPIO77 as ACBIAS for TFT LCD [ARM] 5198/1: PalmTX: PCMCIA fixes [ARM] Fix a pile of broken watchdog drivers [ARM] update mach-types [ARM] 5196/1: fix inline asm constraints for preload [ARM] 5194/1: update .gitignore [ARM] add proc-macros.S include to proc-arm940 and proc-arm946 [ARM] 5192/1: ARM TLB: add v7wbi_{possible,always}_flags to {possible,always}_tlb_flags [ARM] 5193/1: Wire up missing syscalls [ARM] traps: don't call undef hook functions with spinlock held [ARM] 5183/2: Provide Poodle LoCoMo GPIO names [ARM] dma-mapping: provide sync_range APIs [ARM] dma-mapping: improve type-safeness of DMA translations [ARM] Kirkwood: instantiate the orion_spi driver in the platform code [ARM] prevent crashing when too much RAM installed [ARM] Kirkwood: Instantiate mv_xor driver [ARM] Orion: Instantiate mv_xor driver for 5182 ...
Showing
- Documentation/arm/Samsung-S3C24XX/GPIO.txt 15 additions, 0 deletionsDocumentation/arm/Samsung-S3C24XX/GPIO.txt
- Documentation/arm/Samsung-S3C24XX/Overview.txt 33 additions, 2 deletionsDocumentation/arm/Samsung-S3C24XX/Overview.txt
- arch/arm/boot/compressed/.gitignore 2 additions, 1 deletionarch/arm/boot/compressed/.gitignore
- arch/arm/common/dmabounce.c 29 additions, 27 deletionsarch/arm/common/dmabounce.c
- arch/arm/configs/orion5x_defconfig 10 additions, 3 deletionsarch/arm/configs/orion5x_defconfig
- arch/arm/include/asm/dma-mapping.h 70 additions, 16 deletionsarch/arm/include/asm/dma-mapping.h
- arch/arm/include/asm/memory.h 8 additions, 14 deletionsarch/arm/include/asm/memory.h
- arch/arm/include/asm/mtd-xip.h 0 additions, 2 deletionsarch/arm/include/asm/mtd-xip.h
- arch/arm/include/asm/processor.h 2 additions, 2 deletionsarch/arm/include/asm/processor.h
- arch/arm/include/asm/tlbflush.h 5 additions, 2 deletionsarch/arm/include/asm/tlbflush.h
- arch/arm/include/asm/unistd.h 6 additions, 0 deletionsarch/arm/include/asm/unistd.h
- arch/arm/kernel/.gitignore 1 addition, 0 deletionsarch/arm/kernel/.gitignore
- arch/arm/kernel/calls.S 8 additions, 2 deletionsarch/arm/kernel/calls.S
- arch/arm/kernel/setup.c 13 additions, 0 deletionsarch/arm/kernel/setup.c
- arch/arm/kernel/traps.c 18 additions, 13 deletionsarch/arm/kernel/traps.c
- arch/arm/mach-footbridge/cats-pci.c 3 additions, 0 deletionsarch/arm/mach-footbridge/cats-pci.c
- arch/arm/mach-integrator/cpu.c 0 additions, 2 deletionsarch/arm/mach-integrator/cpu.c
- arch/arm/mach-integrator/include/mach/platform.h 0 additions, 2 deletionsarch/arm/mach-integrator/include/mach/platform.h
- arch/arm/mach-kirkwood/common.c 243 additions, 4 deletionsarch/arm/mach-kirkwood/common.c
- arch/arm/mach-kirkwood/common.h 3 additions, 0 deletionsarch/arm/mach-kirkwood/common.h
Loading
Please register or sign in to comment