]> 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, 17 Sep 2012 06:11:07 +0000 (16:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 06:11:07 +0000 (16:11 +1000)
commit1cfb614b44e50b72b5ba3023d265f631695c7608
treee495f7411ae72d91ba317c70df6d9d0aa3c3b7a3
parentb80d2a730d6ef337cb3fded7fa9a394361eff29d
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