From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Fri, 21 Aug 2015 12:39:31 +0000 (+0800)
Subject: Merge branch 'master' of http://exfat.googlecode.com/svn/trunk/ into lollipop-x86
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-exfat.git;a=commitdiff_plain;h=96fa796cf9321b629f785ce73f70dab886990f16

Merge branch 'master' of exfat.googlecode.com/svn/trunk/ into lollipop-x86

Conflicts:
	mkfs/cbm.c
---

96fa796cf9321b629f785ce73f70dab886990f16
diff --cc mkfs/cbm.c
index 7f22a8c,e30928c..951637c
--- a/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@@ -24,7 -26,6 +24,8 @@@
  #include "fat.h"
  #include "uct.h"
  #include "rootdir.h"
 +#include <limits.h>
++#include <string.h>
  
  static off_t cbm_alignment(void)
  {