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

[Maximilian Attems]

Author: maks
Date: Sun Jul  6 09:42:17 2008
New Revision: 11798

Log:
update to 2.6.26-rc9

disable conflicting patches

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	Sun Jul  6 09:42:17 2008
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.26~rc8-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.26~rc9-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release see http://kernelnewbies.org/Linux_2_6_26
     - UDF 2.50 support. (closes: #480910)

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	Sun Jul  6 09:42:17 2008
@@ -22,11 +22,11 @@
 + bugfix/sparc/drivers_net-broken.patch
 + bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
-+ bugfix/mips/ip32_fix_unexpected_irq_71.patch
-+ bugfix/mips/ip22_cache_shift.patch
+#+ bugfix/mips/ip32_fix_unexpected_irq_71.patch
+#+ bugfix/mips/ip22_cache_shift.patch
 + bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch
 + bugfix/mips/ip32_enable_fast_20.patch
-+ bugfix/mips/atomic_sub_if_positive.patch
+#+ bugfix/mips/atomic_sub_if_positive.patch
 + bugfix/arm/disable-dvb_b2c2_flexcop.patch
 + bugfix/arm/disable-dvb_budget.patch
 + bugfix/arm/disable-netxen_nic.patch
@@ -48,6 +48,6 @@
 + features/all/at76.patch 
 + bugfix/fix-hifn_795X-divdi3.patch
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
-+ features/all/0001-iwlwifi-Set-monitor-mode-for-3945.patch
-+ bugfix/all/sdhci-quirk-marvell-cafe-vdd-powerup.patch
-+ bugfix/all/sdhci-quirk-marvell-cafe-interrupt.patch
+#+ features/all/0001-iwlwifi-Set-monitor-mode-for-3945.patch
+#+ bugfix/all/sdhci-quirk-marvell-cafe-vdd-powerup.patch
+#+ bugfix/all/sdhci-quirk-marvell-cafe-interrupt.patch