merge config updates from mainline (i686)

relevant upstream commits (to this and the previous 64-bit merge) are c0bc4, 5cd6b & 12f19
RAMSTER confuses me - they seem to have added, then removed it. I was able to set it for 64-bit earlier,
   but here on 32 it conflicts with HIGHMEM so I left it alone!
5cd6b suggests EFI_VARS is necessary for systemd, but that seems to want a lot of Googly dependencies,
   and afaik Linode doesn't support UEFI anyway, so leaving that out.
upstream set *NOTRACK=m but i set it to N because it's labelled as deprecated!

3 files changed, 28 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a99dbef3fe63..3949314e6f71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -33,7 +33,7 @@ pkgbase = linux-linode
 	source = change-default-console-loglevel.patch
 	md5sums = 21223369d682bcf44bcdfe1521095983
 	md5sums = ec61c44f37585a768d41c0439101ef9c
-	md5sums = 06a07ebb855809edf37ff2f980b9a07d
+	md5sums = 324a7f419b3cbc5032bdd1657dc591ec
 	md5sums = c608bf2cf124fd80b718fce90b82a807
 	md5sums = d01f2350ec9f92e2eabcde0f11be24f2
 	md5sums = ee66f3cd0c5bc0ba0f65499784d19f30
diff --git a/PKGBUILD b/PKGBUILD
index 385ba28d8e21..e2542430cafe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         'change-default-console-loglevel.patch')
 md5sums=('21223369d682bcf44bcdfe1521095983'
          'ec61c44f37585a768d41c0439101ef9c'
-         '06a07ebb855809edf37ff2f980b9a07d'
+         '324a7f419b3cbc5032bdd1657dc591ec'
          'c608bf2cf124fd80b718fce90b82a807'
          'd01f2350ec9f92e2eabcde0f11be24f2'
          'ee66f3cd0c5bc0ba0f65499784d19f30'
diff --git a/config b/config
index a9f56ac21298..50d2d276c83c 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.2-1 Kernel Configuration
+# Linux/i386 3.7.6-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -410,7 +410,7 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_CLEANCACHE is not set
+CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 # CONFIG_HIGHPTE is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
@@ -632,6 +632,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 CONFIG_NETFILTER_XT_TARGET_RATEEST=y
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
@@ -1127,6 +1128,7 @@ CONFIG_DUMMY_CONSOLE=y
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_SELFBALLOONING is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DEV_EVTCHN=y
 CONFIG_XENFS=y
@@ -1137,7 +1139,27 @@ CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_TMEM=y
 CONFIG_XEN_PRIVCMD=y
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_ECHO is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ZSMALLOC is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# CONFIG_PHONE is not set
+# CONFIG_IPACK_BUS is not set
+# CONFIG_WIMAX_GDM72XX is not set
+CONFIG_ZCACHE2=y
+# CONFIG_DGRP is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set
 
 #
@@ -1260,7 +1282,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set