Merge branch 'next' into for-linus
James Morris [Thu, 10 Sep 2009 22:04:49 +0000 (08:04 +1000)]
1  2 
fs/namei.c
kernel/fork.c

diff --cc fs/namei.c
Simple merge
diff --cc kernel/fork.c
Simple merge