Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2009 16:31:14 +0000 (09:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2009 16:31:14 +0000 (09:31 -0700)
commit4c8f1cb266cba4d1052f524d04df839d8f732ace
tree4bf2e6bcc56dcce2c919bca969f6626c8f18b7e6
parent9c1fe834c1bd7725b411055c66886b64c928083d
parented248b290da7297c9b9a3ff180f5eee4db016224
Merge git://git./linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: Check s_dirt in fat_sync_fs()
  vfat: change the default from shortname=lower to shortname=mixed
  fat/nls: Fix handling of utf8 invalid char
fs/fat/inode.c
fs/fat/misc.c
fs/nls/nls_base.c