]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'fsnotify/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 03:02:15 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 03:02:15 +0000 (13:02 +1000)
commitcac36974f4759732e4fe2152e0bcfe616a91cff2
tree3740eda679eb8db1c404ec5ddef714fa33e6c377
parente246cb09ff679e3b5a4793b064fc34e0ad245623
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