]> 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, 11 Oct 2012 00:37:34 +0000 (11:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 00:37:34 +0000 (11:37 +1100)
commit5d6ce26249cdc80c10032b2bd1a91ee646f59000
tree174b2abffb650d1428b7e9774e865bdda9a7e2c0
parentb0f48c36ab2340a1d9fb255a8ce116e316619e8a
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