diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 220bead8f0..71f16cb8cd 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -76,7 +76,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -386,6 +386,7 @@ CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_OPS=y
 CONFIG_ACPI=y
@@ -1391,8 +1392,8 @@ CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_MCEUSB=m
 CONFIG_IR_ENE=m
 CONFIG_IR_STREAMZAP=m
 # CONFIG_DAB is not set
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index eacb5493c7..68ace76a2b 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36-rc6
+# Linux kernel version: 2.6.36-rc7
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -76,7 +76,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -350,6 +350,7 @@ CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_OPS=y
 CONFIG_ACPI=y
@@ -1333,8 +1334,8 @@ CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_MCEUSB=m
 CONFIG_IR_ENE=m
 CONFIG_IR_STREAMZAP=m
 # CONFIG_DAB is not set
diff --git a/projects/generic/linux/linux.i386.conf b/projects/generic/linux/linux.i386.conf
index 285f25ab74..9518876168 100644
--- a/projects/generic/linux/linux.i386.conf
+++ b/projects/generic/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36-rc6
+# Linux kernel version: 2.6.36-rc7
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -76,7 +76,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -387,6 +387,7 @@ CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_OPS=y
 CONFIG_ACPI=y
@@ -1504,8 +1505,8 @@ CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_MCEUSB=m
 CONFIG_IR_ENE=m
 CONFIG_IR_STREAMZAP=m
 # CONFIG_DAB is not set
diff --git a/projects/intel/linux/linux.i386.conf b/projects/intel/linux/linux.i386.conf
index e355dd7d1b..12c27964c7 100644
--- a/projects/intel/linux/linux.i386.conf
+++ b/projects/intel/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36-rc6
+# Linux kernel version: 2.6.36-rc7
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -76,7 +76,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -387,6 +387,7 @@ CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_OPS=y
 CONFIG_ACPI=y
@@ -1352,8 +1353,8 @@ CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_MCEUSB=m
 CONFIG_IR_ENE=m
 CONFIG_IR_STREAMZAP=m
 # CONFIG_DAB is not set
diff --git a/projects/intel/linux/linux.x86_64.conf b/projects/intel/linux/linux.x86_64.conf
index ba700d2f4f..0db1131943 100644
--- a/projects/intel/linux/linux.x86_64.conf
+++ b/projects/intel/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36-rc6
+# Linux kernel version: 2.6.36-rc7
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -76,7 +76,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -352,6 +352,7 @@ CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_OPS=y
 CONFIG_ACPI=y
@@ -1021,6 +1022,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_APPLEIR is not set
 # CONFIG_INPUT_POWERMATE is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
@@ -1294,8 +1296,8 @@ CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_MCEUSB=m
 CONFIG_IR_ENE=m
 CONFIG_IR_STREAMZAP=m
 # CONFIG_DAB is not set
@@ -1539,6 +1541,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX_FF is not set
 CONFIG_HID_APPLE=y
+CONFIG_HID_AUREAL=y
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CANDO is not set
 # CONFIG_HID_CHERRY is not set