Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/ht.c
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Documentation/fb/framebuffer.txt 2 additions, 4 deletionsDocumentation/fb/framebuffer.txt
- Documentation/filesystems/caching/fscache.txt 110 additions, 0 deletionsDocumentation/filesystems/caching/fscache.txt
- Documentation/filesystems/caching/netfs-api.txt 20 additions, 1 deletionDocumentation/filesystems/caching/netfs-api.txt
- Documentation/filesystems/ocfs2.txt 3 additions, 3 deletionsDocumentation/filesystems/ocfs2.txt
- Documentation/slow-work.txt 154 additions, 6 deletionsDocumentation/slow-work.txt
- MAINTAINERS 44 additions, 16 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/thread_info.h 15 additions, 12 deletionsarch/alpha/include/asm/thread_info.h
- arch/alpha/kernel/core_marvel.c 2 additions, 0 deletionsarch/alpha/kernel/core_marvel.c
- arch/alpha/kernel/core_titan.c 2 additions, 0 deletionsarch/alpha/kernel/core_titan.c
- arch/alpha/kernel/irq.c 1 addition, 1 deletionarch/alpha/kernel/irq.c
- arch/alpha/kernel/irq_alpha.c 1 addition, 1 deletionarch/alpha/kernel/irq_alpha.c
- arch/alpha/kernel/irq_i8259.c 1 addition, 1 deletionarch/alpha/kernel/irq_i8259.c
- arch/alpha/kernel/irq_pyxis.c 1 addition, 1 deletionarch/alpha/kernel/irq_pyxis.c
- arch/alpha/kernel/irq_srm.c 1 addition, 1 deletionarch/alpha/kernel/irq_srm.c
- arch/alpha/kernel/sys_alcor.c 1 addition, 1 deletionarch/alpha/kernel/sys_alcor.c
- arch/alpha/kernel/sys_cabriolet.c 1 addition, 1 deletionarch/alpha/kernel/sys_cabriolet.c
- arch/alpha/kernel/sys_dp264.c 2 additions, 2 deletionsarch/alpha/kernel/sys_dp264.c
- arch/alpha/kernel/sys_eb64p.c 1 addition, 1 deletionarch/alpha/kernel/sys_eb64p.c
Loading
Please register or sign in to comment