]> 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, 17 Oct 2012 01:01:18 +0000 (12:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Oct 2012 01:01:18 +0000 (12:01 +1100)
commitb2696ed35b4e81197f45475cb296c2c35aa73b87
tree4e7f59eb0d00e8d9457b856c6d0db74b308b96c7
parent21dea91824f5e0cc2861ca0c3234ca99b4be3285
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