Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/tokenring/tmspci.c drivers/net/ucc_geth_mii.c
Showing
- Documentation/networking/ipv6.txt 35 additions, 0 deletionsDocumentation/networking/ipv6.txt
- Documentation/scsi/cxgb3i.txt 5 additions, 6 deletionsDocumentation/scsi/cxgb3i.txt
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/kernel/setup.c 7 additions, 6 deletionsarch/arm/kernel/setup.c
- arch/arm/mach-at91/pm.c 0 additions, 1 deletionarch/arm/mach-at91/pm.c
- arch/arm/mach-omap2/board-ldp.c 1 addition, 1 deletionarch/arm/mach-omap2/board-ldp.c
- arch/arm/mm/abort-ev6.S 2 additions, 1 deletionarch/arm/mm/abort-ev6.S
- arch/arm/plat-s3c64xx/irq-eint.c 1 addition, 1 deletionarch/arm/plat-s3c64xx/irq-eint.c
- arch/mips/include/asm/seccomp.h 0 additions, 1 deletionarch/mips/include/asm/seccomp.h
- arch/powerpc/include/asm/compat.h 5 additions, 0 deletionsarch/powerpc/include/asm/compat.h
- arch/powerpc/include/asm/seccomp.h 0 additions, 4 deletionsarch/powerpc/include/asm/seccomp.h
- arch/powerpc/platforms/86xx/gef_sbc610.c 4 additions, 0 deletionsarch/powerpc/platforms/86xx/gef_sbc610.c
- arch/s390/crypto/aes_s390.c 1 addition, 1 deletionarch/s390/crypto/aes_s390.c
- arch/sparc/include/asm/compat.h 5 additions, 0 deletionsarch/sparc/include/asm/compat.h
- arch/sparc/include/asm/seccomp.h 0 additions, 6 deletionsarch/sparc/include/asm/seccomp.h
- arch/x86/include/asm/seccomp_32.h 0 additions, 6 deletionsarch/x86/include/asm/seccomp_32.h
- arch/x86/include/asm/seccomp_64.h 0 additions, 8 deletionsarch/x86/include/asm/seccomp_64.h
- arch/x86/kernel/ptrace.c 1 addition, 1 deletionarch/x86/kernel/ptrace.c
- arch/x86/mm/init_64.c 2 additions, 0 deletionsarch/x86/mm/init_64.c
Loading
Please register or sign in to comment