Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-6000.c net/core/dev.c
No related branches found
No related tags found
Showing
- Documentation/RCU/NMI-RCU.txt 22 additions, 17 deletionsDocumentation/RCU/NMI-RCU.txt
- Documentation/RCU/checklist.txt 4 additions, 3 deletionsDocumentation/RCU/checklist.txt
- Documentation/RCU/lockdep.txt 26 additions, 2 deletionsDocumentation/RCU/lockdep.txt
- Documentation/RCU/whatisRCU.txt 6 additions, 0 deletionsDocumentation/RCU/whatisRCU.txt
- Documentation/input/multi-touch-protocol.txt 17 additions, 6 deletionsDocumentation/input/multi-touch-protocol.txt
- Documentation/kernel-parameters.txt 0 additions, 5 deletionsDocumentation/kernel-parameters.txt
- MAINTAINERS 12 additions, 2 deletionsMAINTAINERS
- Makefile 2 additions, 2 deletionsMakefile
- arch/arm/boot/compressed/head.S 1 addition, 1 deletionarch/arm/boot/compressed/head.S
- arch/arm/include/asm/highmem.h 14 additions, 1 deletionarch/arm/include/asm/highmem.h
- arch/arm/include/asm/kmap_types.h 1 addition, 0 deletionsarch/arm/include/asm/kmap_types.h
- arch/arm/include/asm/ucontext.h 11 additions, 12 deletionsarch/arm/include/asm/ucontext.h
- arch/arm/include/asm/user.h 11 additions, 1 deletionarch/arm/include/asm/user.h
- arch/arm/kernel/signal.c 89 additions, 4 deletionsarch/arm/kernel/signal.c
- arch/arm/mach-at91/Makefile 2 additions, 2 deletionsarch/arm/mach-at91/Makefile
- arch/arm/mach-at91/pm_slowclock.S 12 additions, 4 deletionsarch/arm/mach-at91/pm_slowclock.S
- arch/arm/mach-bcmring/dma.c 10 additions, 3 deletionsarch/arm/mach-bcmring/dma.c
- arch/arm/mach-ep93xx/gpio.c 3 additions, 3 deletionsarch/arm/mach-ep93xx/gpio.c
- arch/arm/mach-mx3/Kconfig 10 additions, 0 deletionsarch/arm/mach-mx3/Kconfig
- arch/arm/mach-mx3/clock-imx31.c 2 additions, 3 deletionsarch/arm/mach-mx3/clock-imx31.c
Loading
Please register or sign in to comment