]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 02:45:32 +0000 (13:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 02:45:32 +0000 (13:45 +1100)
commitbb0a654e5c4e11a052571db0bc758a580edfc126
treec2644077a08e0932093a336ce958dfac78840e63
parent09fe5e03fbc5e883c8c5530c572ebf236b0a8703
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