]> 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, 22 Aug 2012 04:02:14 +0000 (14:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 04:02:14 +0000 (14:02 +1000)
commitb5a8b80d80c5fd612b9eccb03bdf72096a3dbcf0
tree88c15dadeb7d473847f1b31672afdba7a6da03a2
parent47f85438c0ddc99c3add075f5e295c457f2fa6aa
parent1aec9c0d718693553543349e92138033b0bcea4c
Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c
fs/notify/fanotify/fanotify_user.c
fs/notify/notification.c
include/linux/fsnotify_backend.h
kernel/audit_tree.c
kernel/audit_watch.c