Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Dec 2008 04:33:34 +0000 (20:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Dec 2008 04:33:34 +0000 (20:33 -0800)
commitec270e59a74eee972006a87c8e12514a20588369
tree6ec13c87f75322a2816c09bb290b6e66bf5116e4
parent6a94cb73064c952255336cc57731904174b2c58f
parent5a6bb10393eb9a1985e97af12f0cb2906bcbf1af
Merge git://git./linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: make sure to set d_ops in fat_get_parent
  fat: fix duplicate addition of ->llseek handler
  fat: drop negative dentry on rename() path
fs/fat/inode.c