]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 14 Oct 2012 23:49:19 +0000 (10:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 14 Oct 2012 23:49:19 +0000 (10:49 +1100)
commit3b741eb6d7dec7cf5363ed6d57286dafa3a4a098
treeefe9e512e7e458f54725be993f02c40237ad6b4b
parent5530d60d521dfead9beabd44d9e53455293645b5
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