[kernel] r11240 - dists/etch-security/linux-2.6/debian

[Dann Frazier]

Author: dannf
Date: Thu May  1 20:00:07 2008
New Revision: 11240

Log:
cleanup changelog mismerge

Modified:
   dists/etch-security/linux-2.6/debian/changelog

Modified: dists/etch-security/linux-2.6/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6/debian/changelog	(original)
+++ dists/etch-security/linux-2.6/debian/changelog	Thu May  1 20:00:07 2008
@@ -3489,23 +3489,3 @@
 
  -- Andres Salomon <dilinger at debian.org>  Wed, 20 Jul 2005 17:16:04 -0400
 
-linux-2.6 (2.6.18.dfsg.1-18etch2.1) stable-security; urgency=high
-
-  * bugfix/powerpc-chrp-null-deref.patch
-    [SECURITY][powerpc] Fix NULL pointer dereference if get_property
-    fails on the subarchitecture
-    See CVE-2007-6694
-  * bugfix/mmap-VM_DONTEXPAND.patch
-    [SECURITY] Add VM_DONTEXPAND to vm_flags in drivers that register
-    a fault handler but do not bounds check the offset argument
-    See CVE-2008-0007
-  * bugfix/RLIMIT_CPU-earlier-checking.patch
-    [SECURITY] Move check for an RLIMIT_CPU with a value of 0 earlier
-    to prevent a user escape (closes: #419706)
-    See CVE-2008-1294
-  * bugfix/dnotify-race.patch
-    [SECURITY] Fix a race in the directory notify
-    See CVE-2008-1375
-  * 
-
- -- dann frazier <dannf at debian.org>  Fri, 11 Apr 2008 23:51:42 -0600