]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:31:21 +0000 (12:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:31:21 +0000 (12:31 +1100)
commitfde3830f4ce13a9f8b16eae9e1172e0346393c65
treea47df55be9a36b6f16936dcb93db99871d6c22a4
parent460e1700a1af17dadd6d7f4f2e09f177652f4a8a
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