Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Aug 2011 21:16:13 +0000 (14:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Aug 2011 21:16:13 +0000 (14:16 -0700)
commitf6a975c50a1c5e68c376634b4331052990ca3dfd
treee3695841740c2f39aa42699fe019cfbba20f5187
parentd522a0d17963e9c2e556db2cbd60c96d40505b6c
parent710d4403a45c4040a9aa86971d50958f5ae6ed40
Merge git://git./linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: fat16 support maximum 4GB file/vol size as WinXP or 7.
  fat: fix utf8 iocharset warning message
  fat: fix build warning
fs/fat/inode.c