Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git] / fs / namei.c
diff --cc fs/namei.c
Simple merge