[kernel] r18534 - dists/trunk/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Sun Jan 15 20:05:23 2012
New Revision: 18534

Log:
Remove pending changelog lines that repeat changes merged from sid

Modified:
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jan 15 20:02:46 2012	(r18533)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jan 15 20:05:23 2012	(r18534)
@@ -3,8 +3,6 @@
   * New upstream release: http://kernelnewbies.org/Linux_3.2
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.1
-    - igmp: Avoid zero delay when receiving odd mixture of IGMP queries
-      (Closes: #654876) (CVE-2012-0207)
 
   [ Aurelien Jarno ]
   * [arm, mips, mipsel, sh4] Add a virtio-modules udeb on flavours which
@@ -23,7 +21,6 @@
     the fix for #649216)
   * [alpha] add io{read,write}{16,32}be functions, thanks to Michael Cree
   * net: reintroduce missing rcu_assign_pointer() calls
-  * Restrict ioctl forwarding on partitions and logical volumes (CVE-2011-4127)
   * Input: ALPS - add support for protocol versions 3 and 4
     (Closes: #618422, #648207)
   * [powerpc/powerpc64] udeb: Drop zlib-modules; ZLIB_DEFLATE is built-in