Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git] / fs / namei.c
diff --cc fs/namei.c
Simple merge