]> 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, 6 Sep 2012 03:38:02 +0000 (13:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:38:02 +0000 (13:38 +1000)
commit1fa12a749af9cf4e0e488188046db64dba91a9f4
treea7afb4349175475e15d5501d63529f20f7230715
parent6ad644bd0fb591ce151a231f13bb040737a5cceb
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