Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 17:14:11 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 17:14:11 +0000 (10:14 -0700)
commita552f0af753eb4b5bbbe9eff205fe874b04c4583
treee4296d70d7364244ef1ae90f91ad827a4d6161a5
parente6423407d01168f7760cdee7270d9f51d1240301
parent3e107603aecf886e1e5bda9dacbd9796eb2a2171
Merge git://git./linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: Fix the removal of opts->fs_dmask