]> 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, 12 Nov 2012 01:56:00 +0000 (12:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 01:56:00 +0000 (12:56 +1100)
commit9e43e9c7452dd6a7c427ae4f36d8998d9c43e877
tree0ded29440339b17d0847d8c6c4050bc451e3e514
parentb650ec3cc4666e4ea1098afdd5ccc3fc81fe6f18
parent1aec9c0d718693553543349e92138033b0bcea4c
Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c
fs/notify/fanotify/fanotify.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