From 6a3d896f69937d7fb73eb217e6e09d9a3b49433b Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sat, 12 Dec 2009 12:36:14 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config/config: Enable
 KSM.

svn path=/dists/trunk/linux-2.6/; revision=14777
---
 debian/changelog     | 1 +
 debian/config/config | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 780e363e1..2dd5f72bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
   [ Bastian Blank ]
   * Allow memory hot-add and -remove if possible.
   * Enable USB suspend.
+  * Enable kernel samepage merging. (closes: #558200)
 
   [ Moritz Muehlenhoff ]
   * Disable cryptoloop (Closes: #559755)
diff --git a/debian/config/config b/debian/config/config
index c5112d495..d409e1715 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3169,6 +3169,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MIGRATION=y
+CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 
 ##