Busybox 1.21.0 squashed commit for jellybean

Change-Id: I423c7fc1254050c6495126b1b18dd33af07fed6b
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 64baae4..135d6a5 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -741,6 +741,15 @@
 	help
 	  TODO
 
+config FEATURE_VOLUMEID_EXFAT
+	bool "exFAT filesystem"
+	default y
+	depends on VOLUMEID
+	help
+	  exFAT (extended FAT) is a proprietary file system designed especially
+	  for flash drives. It has many features from NTFS, but with less
+	  overhead. exFAT is used on most SDXC cards for consumer electronics.
+
 config FEATURE_VOLUMEID_HFS
 	bool "hfs filesystem"
 	default y
@@ -769,6 +778,13 @@
 	help
 	  TODO
 
+config FEATURE_VOLUMEID_NILFS
+	bool "nilfs filesystem"
+	default y
+	depends on VOLUMEID
+	help
+	  TODO
+
 config FEATURE_VOLUMEID_NTFS
 	bool "ntfs filesystem"
 	default y
@@ -832,6 +848,16 @@
 	help
 	  TODO
 
+config FEATURE_VOLUMEID_SQUASHFS
+	bool "SquashFS filesystem"
+	default y
+	depends on VOLUMEID && FEATURE_BLKID_TYPE
+	help
+	  Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+	  intended for general read-only filesystem use and in constrained block
+	  device/memory systems (e.g. embedded systems) where low overhead is
+	  needed.
+
 config FEATURE_VOLUMEID_SYSV
 	bool "sysv filesystem"
 	default y