tree 20c58600b42600b8f62f3cfb63fc62b1a7fbc78c
parent 7949456b1b96924c2d9ae5aea5fa7d4c81c946ed
parent 681142f9211b23e6aa2984259d38b76d7bdc05a8
author Linus Torvalds <torvalds@linux-foundation.org> 1260988166 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260988166 -0800

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