Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/main.c
No related branches found
No related tags found
Showing
- Documentation/DocBook/kernel-locking.tmpl 5 additions, 2 deletionsDocumentation/DocBook/kernel-locking.tmpl
- Documentation/DocBook/tracepoint.tmpl 5 additions, 0 deletionsDocumentation/DocBook/tracepoint.tmpl
- Documentation/hwmon/f71882fg 0 additions, 4 deletionsDocumentation/hwmon/f71882fg
- Documentation/kernel-parameters.txt 14 additions, 9 deletionsDocumentation/kernel-parameters.txt
- Documentation/laptops/thinkpad-acpi.txt 4 additions, 0 deletionsDocumentation/laptops/thinkpad-acpi.txt
- Documentation/lguest/Makefile 2 additions, 1 deletionDocumentation/lguest/Makefile
- Documentation/lguest/lguest.c 12 additions, 11 deletionsDocumentation/lguest/lguest.c
- Documentation/powerpc/booting-without-of.txt 2 additions, 29 deletionsDocumentation/powerpc/booting-without-of.txt
- Documentation/powerpc/hvcs.txt 1 addition, 1 deletionDocumentation/powerpc/hvcs.txt
- MAINTAINERS 65 additions, 34 deletionsMAINTAINERS
- Makefile 3 additions, 3 deletionsMakefile
- arch/alpha/include/asm/cache.h 0 additions, 1 deletionarch/alpha/include/asm/cache.h
- arch/alpha/kernel/err_marvel.c 3 additions, 3 deletionsarch/alpha/kernel/err_marvel.c
- arch/alpha/kernel/osf_sys.c 1 addition, 1 deletionarch/alpha/kernel/osf_sys.c
- arch/alpha/kernel/perf_event.c 9 additions, 9 deletionsarch/alpha/kernel/perf_event.c
- arch/alpha/kernel/process.c 3 additions, 2 deletionsarch/alpha/kernel/process.c
- arch/alpha/kernel/proto.h 0 additions, 3 deletionsarch/alpha/kernel/proto.h
- arch/alpha/kernel/sys_cabriolet.c 16 additions, 3 deletionsarch/alpha/kernel/sys_cabriolet.c
- arch/alpha/kernel/sys_takara.c 9 additions, 2 deletionsarch/alpha/kernel/sys_takara.c
- arch/arm/Kconfig 3 additions, 1 deletionarch/arm/Kconfig
Loading
Please register or sign in to comment