Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
Linus Torvalds [Wed, 30 Sep 2009 16:31:14 +0000 (09:31 -0700)]
* 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

1  2 
fs/fat/inode.c
fs/fat/misc.c
fs/nls/nls_base.c

diff --cc fs/fat/inode.c
Simple merge
diff --cc fs/fat/misc.c
Simple merge
Simple merge