merge 2.6.27.45 branch into trunk

[linux-2.6.git] / planetlab-2.6.27-i686.config

diff --git a/planetlab-2.6.27-i686.config b/planetlab-2.6.27-i686.config
index f31922f..8285e2f 100644 (file)
--- a/planetlab-2.6.27-i686.config
+++ b/planetlab-2.6.27-i686.config
@@ -1101,8 +1101,8 @@ CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
 CONFIG_IFB=m
-CONFIG_EGRE=m
 CONFIG_DUMMY=m
+CONFIG_EGRE=m
 CONFIG_BONDING=m
 CONFIG_MACVLAN=y
 CONFIG_EQUALIZER=m
@@ -1218,6 +1218,7 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 # CONFIG_IP1000 is not set
 CONFIG_IGB=m
+# CONFIG_IGB_LRO is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -2277,7 +2278,7 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 # CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m