]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:05:49 +0000 (15:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:05:49 +0000 (15:05 +1000)
commitefc4f59fc3108117f3ae2bf5d157334b4e31f201
treef68791fd68339098187d3198f6e2b0a7cb26bcd1
parent1db2581de32a74e3803bf67cafc4353ea636f3a6
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