Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c
Showing
- Documentation/DocBook/kgdb.tmpl 5 additions, 3 deletionsDocumentation/DocBook/kgdb.tmpl
- Documentation/cgroups.txt 2 additions, 2 deletionsDocumentation/cgroups.txt
- Documentation/feature-removal-schedule.txt 8 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/filesystems/Locking 0 additions, 2 deletionsDocumentation/filesystems/Locking
- Documentation/filesystems/vfs.txt 0 additions, 4 deletionsDocumentation/filesystems/vfs.txt
- Documentation/hwmon/adt7473 2 additions, 1 deletionDocumentation/hwmon/adt7473
- Documentation/i2c/functionality 52 additions, 43 deletionsDocumentation/i2c/functionality
- Documentation/i2c/smbus-protocol 46 additions, 35 deletionsDocumentation/i2c/smbus-protocol
- Documentation/kernel-parameters.txt 2 additions, 3 deletionsDocumentation/kernel-parameters.txt
- Documentation/memory-barriers.txt 11 additions, 1 deletionDocumentation/memory-barriers.txt
- Documentation/s390/CommonIO 0 additions, 11 deletionsDocumentation/s390/CommonIO
- Documentation/scheduler/sched-design.txt 0 additions, 165 deletionsDocumentation/scheduler/sched-design.txt
- Documentation/video4linux/CARDLIST.cx23885 1 addition, 1 deletionDocumentation/video4linux/CARDLIST.cx23885
- Documentation/video4linux/CARDLIST.em28xx 1 addition, 1 deletionDocumentation/video4linux/CARDLIST.em28xx
- MAINTAINERS 13 additions, 6 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/mach-at91/at91sam9261_devices.c 2 additions, 2 deletionsarch/arm/mach-at91/at91sam9261_devices.c
- arch/arm/mach-at91/at91sam9rl_devices.c 0 additions, 21 deletionsarch/arm/mach-at91/at91sam9rl_devices.c
- arch/arm/mach-ep93xx/core.c 1 addition, 1 deletionarch/arm/mach-ep93xx/core.c
- arch/arm/mach-ns9xxx/irq.c 15 additions, 7 deletionsarch/arm/mach-ns9xxx/irq.c
Loading
Please register or sign in to comment