Merge branch 'master' of git://github.com/relan/exfat into marshmallow-x86

diff --cc libexfat/compiler.h
Simple merge

diff --cc libexfat/exfat.h
Simple merge

diff --cc libexfat/io.c
Simple merge

diff --cc libexfat/log.c
Simple merge

diff --cc libexfat/lookup.c
Simple merge

diff --cc libexfat/node.c
Simple merge

diff --cc libexfat/platform.h
Simple merge

diff --cc libexfat/utf.h
Simple merge

diff --cc libexfat/utils.c
Simple merge

diff --cc mkfs/main.c
Simple merge

diff --cc mkfs/rootdir.c
Simple merge