Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/bluetooth/l2cap_core.c
Showing
- CREDITS 1 addition, 1 deletionCREDITS
- Documentation/Changes 18 additions, 25 deletionsDocumentation/Changes
- Documentation/CodingStyle 2 additions, 2 deletionsDocumentation/CodingStyle
- Documentation/cgroups/blkio-controller.txt 6 additions, 6 deletionsDocumentation/cgroups/blkio-controller.txt
- Documentation/feature-removal-schedule.txt 22 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/filesystems/caching/netfs-api.txt 16 additions, 0 deletionsDocumentation/filesystems/caching/netfs-api.txt
- Documentation/hwmon/f71882fg 4 additions, 0 deletionsDocumentation/hwmon/f71882fg
- Documentation/hwmon/k10temp 6 additions, 2 deletionsDocumentation/hwmon/k10temp
- Documentation/kernel-parameters.txt 2 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/laptops/thinkpad-acpi.txt 5 additions, 0 deletionsDocumentation/laptops/thinkpad-acpi.txt
- Documentation/networking/ip-sysctl.txt 1 addition, 1 deletionDocumentation/networking/ip-sysctl.txt
- Documentation/power/runtime_pm.txt 21 additions, 5 deletionsDocumentation/power/runtime_pm.txt
- Documentation/spinlocks.txt 7 additions, 38 deletionsDocumentation/spinlocks.txt
- MAINTAINERS 13 additions, 2 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- README 21 additions, 21 deletionsREADME
- arch/arm/common/dmabounce.c 1 addition, 1 deletionarch/arm/common/dmabounce.c
- arch/arm/kernel/perf_event.c 4 additions, 2 deletionsarch/arm/kernel/perf_event.c
- arch/arm/kernel/setup.c 2 additions, 0 deletionsarch/arm/kernel/setup.c
- arch/arm/kernel/smp_twd.c 1 addition, 1 deletionarch/arm/kernel/smp_twd.c
Loading
Please register or sign in to comment