From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2009 18:29:26 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
X-Git-Tag: v2.6.33-rc1~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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 discard a mount option
---

337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f