-
- Downloads
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wan/hdlc_fr.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl3945-base.c
Showing
- .gitignore 9 additions, 2 deletions.gitignore
- Documentation/DocBook/kgdb.tmpl 6 additions, 14 deletionsDocumentation/DocBook/kgdb.tmpl
- Documentation/cpusets.txt 1 addition, 1 deletionDocumentation/cpusets.txt
- Documentation/feature-removal-schedule.txt 9 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/filesystems/sysfs-pci.txt 1 addition, 0 deletionsDocumentation/filesystems/sysfs-pci.txt
- Documentation/hwmon/sysfs-interface 13 additions, 20 deletionsDocumentation/hwmon/sysfs-interface
- Documentation/i2c/writing-clients 14 additions, 4 deletionsDocumentation/i2c/writing-clients
- Documentation/networking/ip-sysctl.txt 4 additions, 8 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/video4linux/CARDLIST.au0828 1 addition, 1 deletionDocumentation/video4linux/CARDLIST.au0828
- MAINTAINERS 11 additions, 3 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/Makefile 1 addition, 0 deletionsarch/alpha/Makefile
- arch/alpha/kernel/core_t2.c 2 additions, 0 deletionsarch/alpha/kernel/core_t2.c
- arch/alpha/kernel/pci.c 17 additions, 0 deletionsarch/alpha/kernel/pci.c
- arch/alpha/kernel/traps.c 2 additions, 1 deletionarch/alpha/kernel/traps.c
- arch/arm/common/dmabounce.c 2 additions, 1 deletionarch/arm/common/dmabounce.c
- arch/arm/mach-omap2/gpmc.c 1 addition, 1 deletionarch/arm/mach-omap2/gpmc.c
- arch/arm/mach-realview/platsmp.c 2 additions, 0 deletionsarch/arm/mach-realview/platsmp.c
- arch/arm/plat-omap/dma.c 0 additions, 2 deletionsarch/arm/plat-omap/dma.c
- arch/blackfin/kernel/cplb-nompu/cplbinit.c 4 additions, 2 deletionsarch/blackfin/kernel/cplb-nompu/cplbinit.c
Loading
Please register or sign in to comment