diff --git a/[refs] b/[refs]
index a4d039f81444..ec9221c27f5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a68370515356a3eddbfaf7f56418b3cf85d76c2c
+refs/heads/master: bef62ef339c15d7721da88958b03f7b544464722
diff --git a/trunk/fs/btrfs/Kconfig b/trunk/fs/btrfs/Kconfig
index f8fcf999ea1b..7bb3c020e570 100644
--- a/trunk/fs/btrfs/Kconfig
+++ b/trunk/fs/btrfs/Kconfig
@@ -16,3 +16,16 @@ config BTRFS_FS
 	  module will be called btrfs.
 
 	  If unsure, say N.
+
+config BTRFS_FS_POSIX_ACL
+	bool "Btrfs POSIX Access Control Lists"
+	depends on BTRFS_FS
+	select FS_POSIX_ACL
+	help
+	  POSIX Access Control Lists (ACLs) support permissions for users and
+	  groups beyond the owner/group/world scheme.
+
+	  To learn more about Access Control Lists, visit the POSIX ACLs for
+	  Linux website <http://acl.bestbits.at/>.
+
+	  If you don't know what Access Control Lists are, say N