]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* 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

1  2 
fs/fat/inode.c

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