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

[Jurij Smakov]

Author: jurij-guest
Date: Sat Nov  4 07:57:16 2006
New Revision: 7689

Modified:
   dists/trunk/linux-2.6/debian/changelog
Log:
Remove redundant changelog entry for one of the
sparc patches, which has been merged into 2.6.18.2.
Add appropriate 'closes' at the relevant upstream
entry.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Nov  4 07:57:16 2006
@@ -6,9 +6,6 @@
   [ Jurij Smakov ]
   * [sparc] Remove sparc64-atyfb-xl-gr.patch, it does more harm than
     good in 2.6.18.
-  * [sparc] Add bugfix/sparc/sunblade-clock-hang.patch, fixing the
-    boot-time crash during clock probing on SunBlade 100/150 due to
-    incorrect mapping of PCI resources. (closes: #392078)
   * [sparc] Add bugfix/sparc/compat-alloc-user-space-alignment.patch
     (thanks to David Miller) to make sure that compat_alloc_user_space()
     always returns memory aligned on a 8-byte boundary on sparc. This
@@ -70,6 +67,7 @@
     - SPARC64: Fix central/FHC bus handling on Ex000 systems.
     - SPARC64: Fix memory corruption in pci_4u_free_consistent().
     - SPARC64: Fix PCI memory space root resource on Hummingbird.
+      (closes: #392078)
     - Fix uninitialised spinlock in via-pmu-backlight code.
     - SCSI: aic7xxx: pause sequencer before touching SBLKCTL
     - IPoIB: Rejoin all multicast groups after a port event