[kernel] r5803 - in dists/sid/linux-2.6/debian: . patches/series

[maximilian attems]

Author: maks-guest
Date: Fri Feb 10 09:15:43 2006
New Revision: 5803

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/6
Log:
vorlon's alpha patch merged


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Feb 10 09:15:43 2006
@@ -30,8 +30,9 @@
     - __cmpxchg() must really always be inlined
     - emu10k1 - Fix the confliction of 'Front' control
     - Input: sidewinder - fix an oops
+  * Deactivate merged alpha-cmpxchg-inline.patch.
 
- -- maximilian attems <maks at sternwelten.at>  Fri, 10 Feb 2006 10:00:59 +0100
+ -- maximilian attems <maks at sternwelten.at>  Fri, 10 Feb 2006 10:14:25 +0100
 
 linux-2.6 (2.6.15-5) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/patches/series/6
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/6	(original)
+++ dists/sid/linux-2.6/debian/patches/series/6	Fri Feb 10 09:15:43 2006
@@ -1,2 +1,3 @@
 + powerpc-mkvmlinuz-support-1.patch
+- alpha-cmpxchg-inline.patch
 + 2.6.15.4.patch