merge: aufs-mmap
Signed-off-by:
Robert Nelson <robertcnelson@gmail.com>
Showing
- fs/proc/base.c 1 addition, 1 deletionfs/proc/base.c
- fs/proc/nommu.c 4 additions, 1 deletionfs/proc/nommu.c
- fs/proc/task_mmu.c 5 additions, 2 deletionsfs/proc/task_mmu.c
- fs/proc/task_nommu.c 4 additions, 1 deletionfs/proc/task_nommu.c
- include/linux/mm.h 37 additions, 0 deletionsinclude/linux/mm.h
- include/linux/mm_types.h 6 additions, 0 deletionsinclude/linux/mm_types.h
- kernel/fork.c 1 addition, 1 deletionkernel/fork.c
- mm/Makefile 1 addition, 0 deletionsmm/Makefile
- mm/filemap.c 1 addition, 1 deletionmm/filemap.c
- mm/mmap.c 33 additions, 6 deletionsmm/mmap.c
- mm/nommu.c 5 additions, 5 deletionsmm/nommu.c
- mm/prfile.c 86 additions, 0 deletionsmm/prfile.c
Please register or sign in to comment