Merge changelog with 2.6.12-6 (manually)

svn path=/trunk/kernel/linux-2.6/; revision=4075

debian/changelog

@@ -3,19 +3,33 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low
   [ Bastian Blank ]
   *
 
-  [ Simon Horman ]
-  * 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
-
- -- Simon Horman <horms@debian.org>  Tue, 30 Aug 2005 17:26:25 +0900
+ -- Simon Horman <horms@debian.org>  Tue, 30 Aug 2005 19:27:52 +0900
 
 linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
+  * Change ATM and Classical-IP-over-ATM to be modular, instead of being
+    statically included.
+    (closes: #323143) (Andres Salomon, Bastian Blank)
+
+  [ Sven Luther ]
   * [powerpc]
     - Added pmac-sound sanity check patch.
     - Added preliminary apus patch, not applied though.
 
+  [ 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)
+
+  * 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
+
  -- Bastian Blank <waldi@debian.org>  Fri, 19 Aug 2005 14:39:16 +0200
 
 linux-2.6 (2.6.12-5) unstable; urgency=low