]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 02:27:31 +0000 (13:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 02:27:31 +0000 (13:27 +1100)
commit25dac3929ef17853bb364dcd1d3e6713a633765d
tree5cd97c129bf6694596ac1498f6756439de195416
parent0378ec754c111e468ca72a83645ffecd690e0cb9
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