]> 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, 24 Aug 2012 04:37:11 +0000 (14:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 04:37:11 +0000 (14:37 +1000)
commit0486ffab2324f74eaec0b21cb2a418f75de1fea7
treee9f6760176c03fd6bfeeee35073fffcd8a54b1bf
parent014006a9b8ad4c0eb5087ffc6c871c83dcf3c131
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