From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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