Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/net/pcmcia/fmvj18x_cs.c drivers/net/pcmcia/nmclan_cs.c drivers/net/pcmcia/xirc2ps_cs.c drivers/net/wireless/ray_cs.c
Showing
- Documentation/RCU/trace.txt 49 additions, 205 deletionsDocumentation/RCU/trace.txt
- Documentation/RCU/whatisRCU.txt 1 addition, 1 deletionDocumentation/RCU/whatisRCU.txt
- Documentation/dontdiff 3 additions, 0 deletionsDocumentation/dontdiff
- Documentation/kernel-parameters.txt 16 additions, 12 deletionsDocumentation/kernel-parameters.txt
- Documentation/pcmcia/driver-changes.txt 12 additions, 0 deletionsDocumentation/pcmcia/driver-changes.txt
- Documentation/trace/ftrace-design.txt 11 additions, 2 deletionsDocumentation/trace/ftrace-design.txt
- MAINTAINERS 1 addition, 4 deletionsMAINTAINERS
- Makefile 2 additions, 1 deletionMakefile
- arch/avr32/include/asm/bug.h 1 addition, 1 deletionarch/avr32/include/asm/bug.h
- arch/ia64/include/asm/swiotlb.h 0 additions, 2 deletionsarch/ia64/include/asm/swiotlb.h
- arch/ia64/kernel/pci-swiotlb.c 2 additions, 2 deletionsarch/ia64/kernel/pci-swiotlb.c
- arch/mips/include/asm/bug.h 1 addition, 3 deletionsarch/mips/include/asm/bug.h
- arch/mips/kernel/syscall.c 4 additions, 0 deletionsarch/mips/kernel/syscall.c
- arch/mips/rb532/devices.c 2 additions, 1 deletionarch/mips/rb532/devices.c
- arch/powerpc/kernel/setup_32.c 1 addition, 1 deletionarch/powerpc/kernel/setup_32.c
- arch/powerpc/kernel/setup_64.c 1 addition, 1 deletionarch/powerpc/kernel/setup_64.c
- arch/s390/Kconfig 28 additions, 0 deletionsarch/s390/Kconfig
- arch/s390/include/asm/bug.h 1 addition, 1 deletionarch/s390/include/asm/bug.h
- arch/s390/include/asm/spinlock.h 0 additions, 29 deletionsarch/s390/include/asm/spinlock.h
- arch/s390/kernel/ftrace.c 2 additions, 65 deletionsarch/s390/kernel/ftrace.c
Loading
Please register or sign in to comment