]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 03:35:33 +0000 (13:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 03:35:33 +0000 (13:35 +1000)
commit1e50a5427c4bd221ea544bf2b6ca0adf4ad49a63
treeb794006b7e8143c66743ea8b71dc18546f208b1e
parent3cb31764bf4b782bb22b33ab062b77ed17dd52a0
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