Merge branch 'for-fsnotify' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 3 Mar 2010 22:12:40 +0000 (17:12 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 3 Mar 2010 22:12:40 +0000 (17:12 -0500)
1  2 
fs/namei.c

diff --cc fs/namei.c
Simple merge