Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] update mach-types [ARM] Add cmpxchg support for ARMv6+ systems (v5) [ARM] barriers: improve xchg, bitops and atomic SMP barriers Gemini: Fix SRAM/ROM location after memory swap MAINTAINER: Add F: entries for Gemini and FA526 [ARM] disable NX support for OABI-supporting kernels [ARM] add coherent DMA mask for mv643xx_eth [ARM] pxa/palm: fix PalmLD/T5/TX AC97 MFP [ARM] pxa: add parameter to clksrc_read() for pxa168/910 [ARM] pxa: fix the incorrectly defined drive strength macros for pxa{168,910} [ARM] Orion: Remove explicit name for platform device resources [ARM] Kirkwood: Correct MPP for SATA activity/presence LEDs of QNAP TS-119/TS-219. [ARM] pxa/ezx: fix pin configuration for low power mode [ARM] pxa/spitz: provide spitz_ohci_exit() that unregisters USB_HOST GPIO [ARM] pxa: enable GPIO receivers after configuring pins [ARM] pxa: allow gpio_reset drive high during normal work [ARM] pxa: save/restore PGSR on suspend/resume.
Showing
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- arch/arm/include/asm/assembler.h 13 additions, 0 deletionsarch/arm/include/asm/assembler.h
- arch/arm/include/asm/atomic.h 52 additions, 9 deletionsarch/arm/include/asm/atomic.h
- arch/arm/include/asm/system.h 176 additions, 0 deletionsarch/arm/include/asm/system.h
- arch/arm/kernel/elf.c 9 additions, 0 deletionsarch/arm/kernel/elf.c
- arch/arm/kernel/entry-armv.S 1 addition, 4 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/lib/bitops.h 2 additions, 0 deletionsarch/arm/lib/bitops.h
- arch/arm/mach-gemini/include/mach/hardware.h 1 addition, 2 deletionsarch/arm/mach-gemini/include/mach/hardware.h
- arch/arm/mach-kirkwood/common.c 6 additions, 2 deletionsarch/arm/mach-kirkwood/common.c
- arch/arm/mach-kirkwood/ts219-setup.c 2 additions, 4 deletionsarch/arm/mach-kirkwood/ts219-setup.c
- arch/arm/mach-loki/common.c 6 additions, 0 deletionsarch/arm/mach-loki/common.c
- arch/arm/mach-mmp/include/mach/mfp-pxa168.h 5 additions, 0 deletionsarch/arm/mach-mmp/include/mach/mfp-pxa168.h
- arch/arm/mach-mmp/include/mach/mfp-pxa910.h 5 additions, 0 deletionsarch/arm/mach-mmp/include/mach/mfp-pxa910.h
- arch/arm/mach-mmp/include/mach/mfp.h 3 additions, 6 deletionsarch/arm/mach-mmp/include/mach/mfp.h
- arch/arm/mach-mmp/time.c 1 addition, 1 deletionarch/arm/mach-mmp/time.c
- arch/arm/mach-mv78xx0/common.c 12 additions, 4 deletionsarch/arm/mach-mv78xx0/common.c
- arch/arm/mach-orion5x/common.c 3 additions, 2 deletionsarch/arm/mach-orion5x/common.c
- arch/arm/mach-pxa/ezx.c 18 additions, 18 deletionsarch/arm/mach-pxa/ezx.c
- arch/arm/mach-pxa/include/mach/reset.h 3 additions, 2 deletionsarch/arm/mach-pxa/include/mach/reset.h
- arch/arm/mach-pxa/mfp-pxa2xx.c 6 additions, 0 deletionsarch/arm/mach-pxa/mfp-pxa2xx.c
Loading
Please register or sign in to comment