kernel: annotate bridge multicast backport patch with upstream commits

[openwrt/svn-archive/archive.git] / target / linux / generic / config-3.8

diff --git a/target/linux/generic/config-3.8 b/target/linux/generic/config-3.8
index d2b3d0dd4a696c130ca3ab1087e6a033a394a658..6808b07b05a6cc2c06e66f242a443dda42e9215f 100644 (file)
--- a/target/linux/generic/config-3.8
+++ b/target/linux/generic/config-3.8
@@ -505,6 +505,7 @@ CONFIG_CAVIUM_OCTEON_HELPER=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_DEBUG is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_FSCACHE is not set
@@ -2568,6 +2569,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_RELAY is not set