]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 01:44:12 +0000 (12:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 01:44:12 +0000 (12:44 +1100)
commit76d2fb0c530b266240b14f0fd8434d9c58e796f3
tree804b93aa70db5a947b868c6eb39802ced21be7f3
parent765c07738c5c77e69efe5b4b64d46e5bb3995fb9
parent1aec9c0d718693553543349e92138033b0bcea4c
Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c
fs/notify/fanotify/fanotify_user.c
fs/notify/inotify/inotify_user.c
fs/notify/notification.c
include/linux/fsnotify_backend.h
kernel/audit_tree.c
kernel/audit_watch.c