]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 02:13:44 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 02:13:44 +0000 (13:13 +1100)
commit55bb79c33fcef1e03d670cc603be498a5af4f145
treebef26f3d7275d6ca3501c8ebd47eb4332bd39625
parent6f7270f6c56fb68e13e8959697142dd22b6c5d61
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