Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by:
Vegard Nossum <vegard.nossum@gmail.com>
Showing
- .gitignore 9 additions, 1 deletion.gitignore
- Documentation/Changes 17 additions, 2 deletionsDocumentation/Changes
- Documentation/CodingStyle 2 additions, 2 deletionsDocumentation/CodingStyle
- Documentation/DMA-API.txt 2 additions, 2 deletionsDocumentation/DMA-API.txt
- Documentation/RCU/rculist_nulls.txt 1 addition, 1 deletionDocumentation/RCU/rculist_nulls.txt
- Documentation/SM501.txt 1 addition, 1 deletionDocumentation/SM501.txt
- Documentation/SubmittingPatches 63 additions, 19 deletionsDocumentation/SubmittingPatches
- Documentation/arm/Samsung-S3C24XX/GPIO.txt 5 additions, 5 deletionsDocumentation/arm/Samsung-S3C24XX/GPIO.txt
- Documentation/block/deadline-iosched.txt 1 addition, 1 deletionDocumentation/block/deadline-iosched.txt
- Documentation/braille-console.txt 1 addition, 1 deletionDocumentation/braille-console.txt
- Documentation/dell_rbu.txt 2 additions, 2 deletionsDocumentation/dell_rbu.txt
- Documentation/development-process/5.Posting 28 additions, 3 deletionsDocumentation/development-process/5.Posting
- Documentation/driver-model/devres.txt 1 addition, 1 deletionDocumentation/driver-model/devres.txt
- Documentation/edac.txt 4 additions, 4 deletionsDocumentation/edac.txt
- Documentation/fb/sh7760fb.txt 1 addition, 1 deletionDocumentation/fb/sh7760fb.txt
- Documentation/feature-removal-schedule.txt 10 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/filesystems/autofs4-mount-control.txt 1 addition, 1 deletionDocumentation/filesystems/autofs4-mount-control.txt
- Documentation/filesystems/caching/netfs-api.txt 1 addition, 1 deletionDocumentation/filesystems/caching/netfs-api.txt
- Documentation/filesystems/debugfs.txt 158 additions, 0 deletionsDocumentation/filesystems/debugfs.txt
- Documentation/filesystems/ext4.txt 3 additions, 3 deletionsDocumentation/filesystems/ext4.txt
Loading
Please register or sign in to comment