]> 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, 21 Sep 2012 03:44:17 +0000 (13:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 03:44:17 +0000 (13:44 +1000)
commit4fac03832a280207816f8c288c48a2585a78afee
tree49a85fbb2ebe4df3dd2ca9a6b122954a2e00248c
parent1eaf7af75626e9d58a1b5a5d59969484e20ed502
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