Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/scsi/fcoe/fcoe.c
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Documentation/ABI/testing/debugfs-pktcdvd 3 additions, 3 deletionsDocumentation/ABI/testing/debugfs-pktcdvd
- Documentation/ABI/testing/sysfs-firmware-acpi 6 additions, 2 deletionsDocumentation/ABI/testing/sysfs-firmware-acpi
- Documentation/DocBook/Makefile 3 additions, 2 deletionsDocumentation/DocBook/Makefile
- Documentation/DocBook/kernel-api.tmpl 5 additions, 1 deletionDocumentation/DocBook/kernel-api.tmpl
- Documentation/DocBook/kgdb.tmpl 1 addition, 1 deletionDocumentation/DocBook/kgdb.tmpl
- Documentation/block/biodoc.txt 6 additions, 13 deletionsDocumentation/block/biodoc.txt
- Documentation/cgroups/memory.txt 32 additions, 23 deletionsDocumentation/cgroups/memory.txt
- Documentation/cgroups/resource_counter.txt 21 additions, 6 deletionsDocumentation/cgroups/resource_counter.txt
- Documentation/driver-model/platform.txt 59 additions, 0 deletionsDocumentation/driver-model/platform.txt
- Documentation/filesystems/Locking 16 additions, 8 deletionsDocumentation/filesystems/Locking
- Documentation/filesystems/caching/cachefiles.txt 4 additions, 4 deletionsDocumentation/filesystems/caching/cachefiles.txt
- Documentation/filesystems/pohmelfs/design_notes.txt 3 additions, 2 deletionsDocumentation/filesystems/pohmelfs/design_notes.txt
- Documentation/filesystems/pohmelfs/info.txt 17 additions, 4 deletionsDocumentation/filesystems/pohmelfs/info.txt
- Documentation/filesystems/vfs.txt 1 addition, 2 deletionsDocumentation/filesystems/vfs.txt
- Documentation/input/bcm5974.txt 65 additions, 0 deletionsDocumentation/input/bcm5974.txt
- Documentation/input/multi-touch-protocol.txt 140 additions, 0 deletionsDocumentation/input/multi-touch-protocol.txt
- Documentation/kbuild/makefiles.txt 10 additions, 0 deletionsDocumentation/kbuild/makefiles.txt
- Documentation/kernel-doc-nano-HOWTO.txt 5 additions, 2 deletionsDocumentation/kernel-doc-nano-HOWTO.txt
- Documentation/kernel-parameters.txt 69 additions, 23 deletionsDocumentation/kernel-parameters.txt
Loading
Please register or sign in to comment