Merge remote-tracking branch 'fsnotify/for-next'
commit0d88db72f733545aed124373b113e6665a912df8
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 03:04:03 +0000 (31 13:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 03:04:03 +0000 (31 13:04 +1000)
tree5d696cd5fa32c880eae42f19ac44f631ecd50a2d
parentad700f7f1281592559bff0e354c454fae48b4e7c
parentef9bf3b7144bee6ce1da5616015cabc8771206af
Merge remote-tracking branch 'fsnotify/for-next'
fs/cachefiles/namei.c
fs/nfsd/vfs.c
fs/notify/fanotify/fanotify_user.c
fs/notify/group.c
fs/notify/mark.c
include/linux/fsnotify_backend.h