Sync changelog with sid branch

svn path=/dists/trunk/linux-2.6/; revision=4144

debian/changelog

@@ -7,10 +7,10 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low
 
 linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
 
-  [ Bastian Blank ]
+  [ Andres Salomon, Bastian Blank ]
   * Change ATM and Classical-IP-over-ATM to be modular, instead of being
     statically included.
-    (closes: #323143) (Andres Salomon, Bastian Blank)
+    (closes: #323143)
 
   [ Sven Luther ]
   * [powerpc]
@@ -20,13 +20,17 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
   [ Simon Horman ]
   * Unset CC_OPTIMIZE_FOR_SIZE in i386 config,
     it breaks iproute's (and other netlink users) ability
-    to set routes. (closes: #322723) (Simon Horman)
+    to set routes. (closes: #322723)
+
+  * net-sockglue-cap.patch
+    [Security] Restrict socket policy loading to CAP_NET_ADMIN.
+    See CAN-2005-2555.
 
   * zlib deflateBound() patch added as part of the 2.6.12.5 patch in
     2.6.12-3 now has a CAN number.
     See CAN-2005-2457
 
-  * Added 2.6.12.6 
+  * Added 2.6.12.6
     - [Security] Restrict socket policy loading to CAP_NET_ADMIN.
       See CAN-2005-2555.
     - [Maybe-Security: Can remote traffic trigger this]
@@ -34,12 +38,16 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
     - [Maybe-Security: Seems like a local DoS]
       NPTL signal delivery deadlock fix
     - fix gl_skb/skb type error in genelink driver in usbnet
-    - [Maybe-Security: Seems like a local DoS]
-      fix a memory leak in devices seq_file implementation
+    - [Security] fix a memory leak in devices seq_file implementation
+      See CAN-2005-2800
     - [Maybe-Security: Seems like a local DoS]
       Fix SKB leak in ip6_input_finish()
 
- -- Bastian Blank <waldi@debian.org>  Fri, 19 Aug 2005 14:39:16 +0200
+  * amd64-insert_vm_struct-leak.patch
+    [Security] TASK_SIZE fixes for compatibility mode processes
+    See CAN-2005-2617
+
+ -- Simon Horman <horms@debian.org>  Fri,  9 Sep 2005 11:30:06 +0900
 
 linux-2.6 (2.6.12-5) unstable; urgency=low