Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Showing
- Documentation/kernel-parameters.txt 4 additions, 1 deletionDocumentation/kernel-parameters.txt
- arch/arm/mach-shmobile/board-ap4evb.c 56 additions, 0 deletionsarch/arm/mach-shmobile/board-ap4evb.c
- arch/arm/mach-shmobile/board-mackerel.c 78 additions, 0 deletionsarch/arm/mach-shmobile/board-mackerel.c
- arch/arm/mach-shmobile/clock-sh7372.c 7 additions, 0 deletionsarch/arm/mach-shmobile/clock-sh7372.c
- arch/blackfin/lib/strncpy.S 1 addition, 1 deletionarch/blackfin/lib/strncpy.S
- arch/sh/Kconfig 1 addition, 1 deletionarch/sh/Kconfig
- arch/sh/boards/mach-ap325rxa/setup.c 13 additions, 19 deletionsarch/sh/boards/mach-ap325rxa/setup.c
- arch/sh/boards/mach-ecovec24/setup.c 3 additions, 0 deletionsarch/sh/boards/mach-ecovec24/setup.c
- arch/sh/include/asm/pgtable.h 1 addition, 0 deletionsarch/sh/include/asm/pgtable.h
- arch/sh/include/asm/ptrace.h 4 additions, 2 deletionsarch/sh/include/asm/ptrace.h
- arch/sh/include/asm/tlb.h 1 addition, 0 deletionsarch/sh/include/asm/tlb.h
- arch/sh/include/cpu-sh4/cpu/sh7722.h 1 addition, 0 deletionsarch/sh/include/cpu-sh4/cpu/sh7722.h
- arch/sh/include/cpu-sh4/cpu/sh7724.h 1 addition, 0 deletionsarch/sh/include/cpu-sh4/cpu/sh7724.h
- arch/sh/include/cpu-sh4/cpu/sh7757.h 1 addition, 0 deletionsarch/sh/include/cpu-sh4/cpu/sh7757.h
- arch/sh/kernel/process_32.c 1 addition, 0 deletionsarch/sh/kernel/process_32.c
- arch/sh/mm/consistent.c 1 addition, 1 deletionarch/sh/mm/consistent.c
- block/blk-ioc.c 2 additions, 2 deletionsblock/blk-ioc.c
- block/cfq-iosched.c 4 additions, 7 deletionsblock/cfq-iosched.c
- drivers/block/nbd.c 20 additions, 2 deletionsdrivers/block/nbd.c
- drivers/block/paride/pcd.c 0 additions, 1 deletiondrivers/block/paride/pcd.c
Loading
Please register or sign in to comment