tree e3695841740c2f39aa42699fe019cfbba20f5187
parent d522a0d17963e9c2e556db2cbd60c96d40505b6c
parent 710d4403a45c4040a9aa86971d50958f5ae6ed40
author Linus Torvalds <torvalds@linux-foundation.org> 1313702173 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1313702173 -0700

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: fat16 support maximum 4GB file/vol size as WinXP or 7.
  fat: fix utf8 iocharset warning message
  fat: fix build warning