Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: sound/core/memalloc.c
Showing
- .mailmap 2 additions, 0 deletions.mailmap
- Documentation/00-INDEX 0 additions, 2 deletionsDocumentation/00-INDEX
- Documentation/DMA-API.txt 1 addition, 1 deletionDocumentation/DMA-API.txt
- Documentation/DMA-mapping.txt 1 addition, 1 deletionDocumentation/DMA-mapping.txt
- Documentation/DocBook/kernel-api.tmpl 5 additions, 0 deletionsDocumentation/DocBook/kernel-api.tmpl
- Documentation/DocBook/mac80211.tmpl 4 additions, 8 deletionsDocumentation/DocBook/mac80211.tmpl
- Documentation/HOWTO 2 additions, 1 deletionDocumentation/HOWTO
- Documentation/RCU/checklist.txt 1 addition, 1 deletionDocumentation/RCU/checklist.txt
- Documentation/RCU/rcuref.txt 8 additions, 8 deletionsDocumentation/RCU/rcuref.txt
- Documentation/RCU/whatisRCU.txt 0 additions, 2 deletionsDocumentation/RCU/whatisRCU.txt
- Documentation/SELinux.txt 27 additions, 0 deletionsDocumentation/SELinux.txt
- Documentation/SubmitChecklist 2 additions, 0 deletionsDocumentation/SubmitChecklist
- Documentation/block/deadline-iosched.txt 10 additions, 4 deletionsDocumentation/block/deadline-iosched.txt
- Documentation/cdrom/ide-cd 1 addition, 2 deletionsDocumentation/cdrom/ide-cd
- Documentation/cpu-freq/index.txt 4 additions, 6 deletionsDocumentation/cpu-freq/index.txt
- Documentation/feature-removal-schedule.txt 21 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/hwmon/adt7473 5 additions, 13 deletionsDocumentation/hwmon/adt7473
- Documentation/hwmon/sysfs-interface 12 additions, 0 deletionsDocumentation/hwmon/sysfs-interface
- Documentation/ioctl/cdrom.txt 2 additions, 2 deletionsDocumentation/ioctl/cdrom.txt
- Documentation/kernel-doc-nano-HOWTO.txt 2 additions, 2 deletionsDocumentation/kernel-doc-nano-HOWTO.txt
Loading
Please register or sign in to comment