[kernel] r22205 - in dists/sid/linux/debian: . config/armel

[Ian James Campbell]

Author: ijc
Date: Fri Dec 19 08:54:04 2014
New Revision: 22205

Log:
[armel/kirkwood] mm: Disable KSM

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/armel/config.kirkwood

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Dec 19 08:51:33 2014	(r22204)
+++ dists/sid/linux/debian/changelog	Fri Dec 19 08:54:04 2014	(r22205)
@@ -18,6 +18,7 @@
     - Warn if image size leaves less than 1% spare capacity in the flash. This
       allows some slack for growth over the lifetime of a stable release.
     - [/kirkwood] Disable RD_LZO and RD_LZ4
+    - [/kirkwood] mm: Disable KSM
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 13 Dec 2014 11:45:48 +0000
 

Modified: dists/sid/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux/debian/config/armel/config.kirkwood	Fri Dec 19 08:51:33 2014	(r22204)
+++ dists/sid/linux/debian/config/armel/config.kirkwood	Fri Dec 19 08:54:04 2014	(r22205)
@@ -641,6 +641,7 @@
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
+# CONFIG_KSM is not set
 
 ##
 ## file: net/atm/Kconfig