From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Dec 2008 04:33:34 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
X-Git-Tag: v2.6.29-rc1~551
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ec270e59a74eee972006a87c8e12514a20588369;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/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
---

ec270e59a74eee972006a87c8e12514a20588369