[kernel] r10552 - in dists/trunk/linux-2.6/debian: . patches/bugfix patches/series

[Maximilian Attems]

Author: maks
Date: Sat Feb 16 19:29:35 2008
New Revision: 10552

Log:
update to 2.6.25-rc2

almost no conflicts beside a sata_mv merged patch, thus nuked.


Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/sata_mv-dma.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Feb 16 19:29:35 2008
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.25~rc1-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.25~rc2-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release (closes: #456799)
 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Sat Feb 16 19:29:35 2008
@@ -30,6 +30,5 @@
 + bugfix/arm/disable-scsi_acard.patch
 #+ bugfix/arm/disable-ath5k.patch
 #the following will be fixed before 2.6.25 is out:
-+ bugfix/sata_mv-dma.patch
 + bugfix/sata_mv-platform_driver.patch
 + bugfix/arm/ignore-invalid-memtags.patch