]> 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, 7 Nov 2012 01:55:28 +0000 (12:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 01:55:28 +0000 (12:55 +1100)
commit01e2a3f627cee352833ff1245edc3e9f6a9a3785
treea7f6797a5e912ab4d4c5a27a94f819d814ec246e
parentd89477fdb53bd09d962e2499ed06fd4a44012f4e
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