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: split fat_generic_ioctl
  FAT: add 'errors' mount option

diff --cc Documentation/filesystems/vfat.txt
Simple merge

diff --cc fs/fat/dir.c
Simple merge

diff --cc fs/fat/fat.h
Simple merge

diff --cc fs/fat/fatent.c
Simple merge

diff --cc fs/fat/file.c
Simple merge

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

diff --cc fs/fat/namei_msdos.c
Simple merge

diff --cc fs/fat/namei_vfat.c
Simple merge