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] 3941/1: [Jornada7xx] - Addition to MAINTAINERS [ARM] 3942/1: ARM: comment: consistent_sync should not be called directly [ARM] ebsa110: fix warnings generated by asm/arch/io.h [ARM] 3933/1: Source drivers/ata/Kconfig
Showing
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- arch/arm/Kconfig 2 additions, 0 deletionsarch/arm/Kconfig
- arch/arm/mach-ebsa110/io.c 4 additions, 4 deletionsarch/arm/mach-ebsa110/io.c
- arch/arm/mm/consistent.c 3 additions, 0 deletionsarch/arm/mm/consistent.c
- include/asm-arm/arch-ebsa110/io.h 11 additions, 5 deletionsinclude/asm-arm/arch-ebsa110/io.h
- include/asm-arm/dma-mapping.h 4 additions, 0 deletionsinclude/asm-arm/dma-mapping.h
Loading
Please register or sign in to comment