Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000e/ich8lan.c drivers/net/e1000e/netdev.c
No related branches found
No related tags found
Showing
- Documentation/HOWTO 2 additions, 1 deletionDocumentation/HOWTO
- Documentation/SubmitChecklist 2 additions, 0 deletionsDocumentation/SubmitChecklist
- Documentation/video4linux/CARDLIST.em28xx 1 addition, 1 deletionDocumentation/video4linux/CARDLIST.em28xx
- Documentation/video4linux/gspca.txt 1 addition, 0 deletionsDocumentation/video4linux/gspca.txt
- MAINTAINERS 1 addition, 2 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/ia64/include/asm/sections.h 3 additions, 0 deletionsarch/ia64/include/asm/sections.h
- arch/ia64/kernel/head.S 5 additions, 4 deletionsarch/ia64/kernel/head.S
- arch/ia64/kernel/vmlinux.lds.S 5 additions, 3 deletionsarch/ia64/kernel/vmlinux.lds.S
- arch/ia64/mm/contig.c 1 addition, 1 deletionarch/ia64/mm/contig.c
- arch/ia64/mm/discontig.c 1 addition, 1 deletionarch/ia64/mm/discontig.c
- arch/mips/Kconfig 20 additions, 33 deletionsarch/mips/Kconfig
- arch/mips/kernel/Makefile 1 addition, 0 deletionsarch/mips/kernel/Makefile
- arch/mips/kernel/cevt-r4k.c 48 additions, 125 deletionsarch/mips/kernel/cevt-r4k.c
- arch/mips/kernel/cevt-smtc.c 321 additions, 0 deletionsarch/mips/kernel/cevt-smtc.c
- arch/mips/kernel/cpu-probe.c 7 additions, 3 deletionsarch/mips/kernel/cpu-probe.c
- arch/mips/kernel/entry.S 5 additions, 5 deletionsarch/mips/kernel/entry.S
- arch/mips/kernel/genex.S 2 additions, 2 deletionsarch/mips/kernel/genex.S
- arch/mips/kernel/head.S 1 addition, 0 deletionsarch/mips/kernel/head.S
- arch/mips/kernel/mips-mt-fpaff.c 1 addition, 1 deletionarch/mips/kernel/mips-mt-fpaff.c
Loading
Please register or sign in to comment