]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:53:43 +0000 (13:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:53:43 +0000 (13:53 +1000)
commit5b8f66a369322ee4f3ba3aeff0362c00a07282c2
tree2c1b03cdaafa602cb2f973561d9dac94191d4336
parentc6cdfbcef1ab5f28e663efbfd2cd76318d5cb53a
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