[kernel] r15280 - in dists/sid/linux-2.6/debian: . config

[Moritz Muehlenhoff]

Author: jmm
Date: Thu Feb 25 23:07:48 2010
New Revision: 15280

Log:
Enable CONFIG_KEYS_DEBUG_PROC_KEYS

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Feb 25 21:38:44 2010	(r15279)
+++ dists/sid/linux-2.6/debian/changelog	Thu Feb 25 23:07:48 2010	(r15280)
@@ -1,7 +1,11 @@
 linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
 
+  [ maximilian attems]
   * tcp: fix ICMP-RTO war.
 
+  [ Moritz Muehlenhoff ]
+  * Enable CONFIG_KEYS_DEBUG_PROC_KEYS (Closes: #400932)
+
  -- maximilian attems <maks at debian.org>  Thu, 25 Feb 2010 13:07:47 +0100
 
 linux-2.6 (2.6.32-9) unstable; urgency=high

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Thu Feb 25 21:38:44 2010	(r15279)
+++ dists/sid/linux-2.6/debian/config/config	Thu Feb 25 23:07:48 2010	(r15280)
@@ -3885,7 +3885,7 @@
 ## file: security/Kconfig
 ##
 CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y