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