Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:29:26 +0000 (10:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:29:26 +0000 (10:29 -0800)
commit337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f
tree20c58600b42600b8f62f3cfb63fc62b1a7fbc78c
parent7949456b1b96924c2d9ae5aea5fa7d4c81c946ed
parent681142f9211b23e6aa2984259d38b76d7bdc05a8
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