]> 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, 30 Oct 2012 02:23:40 +0000 (13:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 02:23:40 +0000 (13:23 +1100)
commit18ae76d3e315333b785a66a4cfcc395aeca2ea5d
tree6f69707d4c20abd5cfed14a0ebf0a9dbf43fad19
parent31005c7041b8654a89a3991cc8d5ca3eeb8b2c2d
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