[kernel] r11162 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm bugfix/mips series

[Maximilian Attems]

Author: maks
Date: Fri Apr 25 11:02:56 2008
New Revision: 11162

Log:
latest git sync

comment clashing arm patches, porter will have to redo,
as not seen yet merged, but files moved around.

nuke 2 patches presumed merged, tbm please double check. :)


Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/ts209-set-mac.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/tulip_mwi_fix.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

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	Fri Apr 25 11:02:56 2008
@@ -16,15 +16,13 @@
 + bugfix/powerpc/oldworld-boot-fix.patch
 + bugfix/powerpc/prep-utah-ide-interrupt.patch
 + bugfix/powerpc/serial.patch
-+ bugfix/mips/tulip_mwi_fix.patch
 + bugfix/arm/orion-enawrallo.patch
 + features/arm/ixp4xx-net-drivers.patch
 + features/arm/linkstation.patch
-+ bugfix/arm/ts209-set-mac.patch
-+ features/arm/orion-mv88f5281-d0.patch
-+ features/arm/ts409.patch
+##+ features/arm/orion-mv88f5281-d0.patch
+##+ features/arm/ts409.patch
 + features/all/rtc-pcf8563-new-style-conversion.patch
-+ features/arm/mv2120.patch
+##+ features/arm/mv2120.patch
 + bugfix/sparc/drivers_net-broken.patch
 + bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
@@ -34,7 +32,7 @@
 + bugfix/arm/disable-chelsio_t3.patch
 + bugfix/arm/disable-video_bt848.patch
 + bugfix/arm/disable-scsi_acard.patch
-+ bugfix/arm/disable-ath5k.patch
+##+ bugfix/arm/disable-ath5k.patch
 + bugfix/arm/disable-r6040.patch
 + features/all/at76.patch 
 + bugfix/fix-hifn_795X-divdi3.patch