Merge branch 'work.exfat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull exfat filesystem from Al Viro:
 "Shiny new fs/exfat replacement for drivers/staging/exfat"

* 'work.exfat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  exfat: update file system parameter handling
  staging: exfat: make staging/exfat and fs/exfat mutually exclusive
  MAINTAINERS: add exfat filesystem
  exfat: add Kconfig and Makefile
  exfat: add nls operations
  exfat: add misc operations
  exfat: add exfat cache
  exfat: add bitmap operations
  exfat: add fat entry operations
  exfat: add file operations
  exfat: add directory operations
  exfat: add inode operations
  exfat: add super block operations
  exfat: add in-memory and on-disk structures and headers

diff --cc MAINTAINERS
index 9e7896a99355d40e4c5099fd134d9a7544dbdad2,27d912bc5ae2e6020c0c7beb7815f29cea4e5cc4..367bab4e3ec10c81165b351fb1085be2f46ed2cc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6385,6 -6305,19 +6385,13 @@@ F:    include/trace/events/mdio.
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
  
 -EXFAT FILE SYSTEM
 -M:    Valdis Kletnieks <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/exfat/
 -
+ EXFAT FILE SYSTEM
+ M:    Namjae Jeon <[email protected]>
+ M:    Sungjong Seo <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    fs/exfat/
+ 
  EXT2 FILE SYSTEM
  M:    Jan Kara <[email protected]>
  L:    [email protected]