rpms/kernel/devel linux-2.6-wireless-pending.patch,1.37,1.38

John W. Linville (linville) fedora-extras-commits at redhat.com
Mon Mar 24 20:50:00 UTC 2008


Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21618

Modified Files:
	linux-2.6-wireless-pending.patch 
Log Message:
fixup wireless-pending patch damage due to upstream merge mixup

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.37 -r 1.38 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- linux-2.6-wireless-pending.patch	24 Mar 2008 17:34:04 -0000	1.37
+++ linux-2.6-wireless-pending.patch	24 Mar 2008 20:49:42 -0000	1.38
@@ -1,4214 +1,6 @@
-commit 2cd41eac2a895b01bd0824ba098f78b870136be2
-Author: Reinette Chatre <reinette.chatre at intel.com>
-Date:   Tue Mar 11 16:17:15 2008 -0700
-
-    iwlwifi: fix bug to show hidden APs during scan
-    
-    Indirect scanning ('iwlist scan') should report information about
-    hidden APs. When an AP is hidden it does not respond to active scanning,
-    we thus have to use passive scanning to locate these APs.
-    
-    This fixes http://bughost.org/bugzilla/show_bug.cgi?id=1499
-    
-    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
-    Tested-by: Bill Moss <bmoss at clemson.edu>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 3352880fca5d5564d0c9f23948b7e05d16519759
-Author: Tomas Winkler <tomas.winkler at intel.com>
-Date:   Tue Mar 11 16:17:20 2008 -0700
-
-    iwlwifi: change rate number to a constant
-    
-    This patch moves a number to an understandable define
-    
-    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
-    Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit c794c989cab1369ae9e667ed5b77e6f813f9e2b3
-Author: Tomas Winkler <tomas.winkler at intel.com>
-Date:   Tue Mar 11 16:17:19 2008 -0700
-
-    iwlwifi: Fix endianity in debug print
-    
-    This patch fix debug print out endianity issue for bitmap
-    Since u64 and le64 variables are casted to unsigned long long,
-    after patch 'wireless: correct warnings from using '%llx' for type 'u64'
-    also bitmaps need to be converted to native endianity
-    
-    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
-    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 42ff182a205f7a36771f54b93d8fa04a86aec166
-Author: Assaf Krauss <assaf.krauss at intel.com>
-Date:   Tue Mar 11 16:17:18 2008 -0700
-
-    iwlwifi: Use eeprom form iwlcore
-    
-    This patch puts in use eeprom from iwlcore module
-    
-    Signed-off-by: Assaf Krauss <assaf.krauss at intel.com>
-    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 4707ca7feed461a8cbc3dd19cde5bc1451296f11
-Author: Reinette Chatre <reinette.chatre at intel.com>
-Date:   Tue Mar 11 16:17:17 2008 -0700
-
-    iwlwifi: update copyright year
-    
-    Also fix a copy and paste error in header of iwl-core.c. This file
-    is not dual licensed.
-    
-    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 8535c56523a1c999a381009ea794e47e04070432
-Author: Tomas Winkler <tomas.winkler at intel.com>
-Date:   Tue Mar 11 16:17:16 2008 -0700
-
-    iwlwifi: Use sta_bcast_id variable instead of BROADCAST_ID constant
-    
-    This patch removes iwlYYY_BROADCAST_ID from run time usage.
-    hw_setting.sta_bcast_id is used instead.
-    
-    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
-    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit a968fa909c2a245ed4c4175de704fc184dbc6ba8
-Author: Michael Buesch <mb at bu3sch.de>
-Date:   Mon Mar 10 17:26:32 2008 +0100
-
-    ssb: Add SPROM/invariants support for PCMCIA devices
-    
-    This adds support for reading/writing the SPROM invariants
-    for PCMCIA based devices.
-    
-    Signed-off-by: Michael Buesch <mb at bu3sch.de>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit bfc6c4d9238c3ee8324b35e0bf5a8ad565f2501a
-Author: Joe Perches <joe at perches.com>
-Date:   Sun Mar 9 16:55:10 2008 -0700
-
-    include/net/ieee80211.h - remove duplicate include
-    
-    Signed-off-by: Joe Perches <joe at perches.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit f6b32dc11fb7ac50baba66e0446f0d18a2b831e1
-Author: Ivo van Doorn <ivdoorn at gmail.com>
-Date:   Mon Mar 10 00:30:44 2008 +0100
-
-    rt2x00: Only strip preamble bit in rt2400pci
-    
-    Only rt2400pci can have the preamble bit set in the PLCP value,
-    for all other drivers it should not be cleared since that will
-    conflict with the plcp values for OFDM rates.
-    
-    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 17e0212fe66d07ffc2df8b034e35a12a187ffd19
-Author: Ivo van Doorn <ivdoorn at gmail.com>
-Date:   Sun Mar 9 22:49:21 2008 +0100
-
-    rt2x00: Release rt2x00 2.1.4
-    
-    Version bump to 2.1.4
-    
-    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 54e19697da963c5dd36f2827fe6936052854ccc8
-Author: Ivo van Doorn <ivdoorn at gmail.com>
-Date:   Sun Mar 9 22:49:04 2008 +0100
-
-    rt2x00: Fix rt2400pci signal
-    
-    After sampling hundreds of RX frame descriptors,
-    the results were conclusive:
-    - The Ralink documentation regarding the SIGNAL and RSSI are wrong.
-    
-    It turns out that of the 5 BBR registers, we should not use BBR0 and BBR1
-    for SIGNAL and RSSI respectively, but actually BBR1 and BBR2.
-    BBR0 does show values, but the exact meaning remains unclear,
-    but they cannot be translated into a SIGNAL or RSSI field.
-    BBR3, BBR4 and BBR5 are always 0, so their meaning is unknown.
-    
-    As it turns out, the reported SIGNAL is the PLCP value, this
-    in contradiction to what was expected looking at rt2500pci which
-    only reported the PLCP values for OFDM rates and bitrate values
-    for CCK rates.
-    
-    This means we should let the driver raise the flag about the contents
-    of the SIGNAL field so rt2x00lib can always do the right thing based
-    on what the driver reports.
-    
-    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit d187f182a14f4d0b36f3595c416127e6a2290884
-Author: Ivo van Doorn <ivdoorn at gmail.com>
-Date:   Sun Mar 9 22:48:46 2008 +0100
-
-    rt2x00: Fix RX DMA ring initialization
-    
-    Due to a terrible typo the RX DMA base address
-    was initialized to the beacon base address.
-    Obviously bad things happen with bugs like that....
-    
-    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 8d4e8648eb868e2c37797060953c4e3fbdc2d7bf
-Author: Ivo van Doorn <ivdoorn at gmail.com>
-Date:   Sun Mar 9 22:48:08 2008 +0100
-
-    rt2x00: Fix basic rate initialization
-    
-    The basic rate which is configured in the register
-    should not match all supported rates, but only the _basic_ rates.
-    
-    Fix this by adding a new flag to the rt2x00_rate structure
-    and whenever the mode is changed, loop over all available rates
-    for that band to get the basic rate mask.
-    
-    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 2119e258add7af90c15bb9370f0b7d634aafb50e
-Author: Ivo van Doorn <ivdoorn at gmail.com>
-Date:   Sun Mar 9 22:47:43 2008 +0100
-
-    rt2x00: Always enable TSF ticking
-    
-    Whatever mode we are in, according to the legacy drivers
-    we should always enable TSF ticking/counting.
-    We should also always enable the TBCN/TBTT field,
[...6711 lines suppressed...]
@@ -77602,8 +73403,8 @@
  
  	/* While philips SA2400 drive the PA bias from
 diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig	2008-03-14 13:27:23.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c	2008-03-24 16:43:58.000000000 -0400
 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
  	{ 0 }
  };
@@ -77773,8 +73574,8 @@
  	err = ieee80211_register_hw(dev);
  	if (err) {
 diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile
---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Makefile	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Makefile	2008-03-24 16:43:58.000000000 -0400
 @@ -1,6 +1,7 @@
  # core
  ssb-y					+= main.o scan.o
@@ -77792,8 +73593,8 @@
  # b43 pci-ssb-bridge driver
  # Not strictly a part of SSB, but kept here for convenience
 diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c
---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c	2008-03-24 16:43:58.000000000 -0400
 @@ -3,7 +3,7 @@
   * PCMCIA-Hostbus related functions
   *
@@ -78466,8 +74267,8 @@
 +	return err;
  }
 diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c
---- linux-2.6.24.noarch/drivers/ssb/main.c.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/main.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/main.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/main.c	2008-03-24 16:43:58.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/io.h>
  #include <linux/ssb/ssb.h>
@@ -78605,8 +74406,8 @@
  	bus_unregister(&ssb_bustype);
  }
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c
---- linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c	2008-03-24 16:43:58.000000000 -0400
 @@ -209,6 +209,7 @@ void ssb_mipscore_init(struct ssb_mipsco
  			/* fallthrough */
  		case SSB_DEV_PCI:
@@ -78616,8 +74417,8 @@
  		case SSB_DEV_USB20_HOST:
  			/* These devices get their own IRQ line if available, the rest goes on IRQ0 */
 diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h
---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h	2008-03-24 16:43:58.000000000 -0400
 @@ -81,6 +81,7 @@ extern int ssb_pcmcia_switch_segment(str
  				     u8 seg);
  extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
@@ -78664,8 +74465,8 @@
  /* b43_pci_bridge.c */
  #ifdef CONFIG_SSB_B43_PCI_BRIDGE
 diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/driver_gige.c
---- /dev/null	2008-03-14 08:48:03.721890422 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c	2008-03-14 16:40:55.000000000 -0400
+--- /dev/null	2008-03-24 08:05:25.710634313 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c	2008-03-24 16:43:58.000000000 -0400
 @@ -0,0 +1,294 @@
 +/*
 + * Sonics Silicon Backplane
@@ -78962,8 +74763,8 @@
 +	return ssb_driver_register(&ssb_gige_driver);
 +}
 diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c
---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pci.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pci.c	2008-03-24 16:43:58.000000000 -0400
 @@ -227,7 +227,7 @@ static u8 ssb_sprom_crc(const u16 *sprom
  	return crc;
  }
@@ -79180,8 +74981,8 @@
  	if (err)
  		goto out;
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c
---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c	2008-03-24 16:43:58.000000000 -0400
 @@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc
  	chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
  }
@@ -79200,8 +75001,8 @@
  {
  	return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
 diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig
---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Kconfig	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Kconfig	2008-03-24 16:43:58.000000000 -0400
 @@ -20,6 +20,10 @@ config SSB
  
  	  If unsure, say N.
@@ -79244,8 +75045,8 @@
 +
  endmenu
 diff -up linux-2.6.24.noarch/drivers/ssb/embedded.c.orig linux-2.6.24.noarch/drivers/ssb/embedded.c
---- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/embedded.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/embedded.c	2008-03-24 16:43:58.000000000 -0400
 @@ -10,6 +10,9 @@
  
  #include <linux/ssb/ssb.h>
@@ -79348,8 +75149,8 @@
 +	return -ENODEV;
 +}
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c
---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig	2008-03-14 13:27:24.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c	2008-03-24 16:43:58.000000000 -0400
 @@ -60,77 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
  /* Core to access the external PCI config space. Can only have one. */
  static struct ssb_pcicore *extpci_core;
@@ -79525,8 +75326,8 @@
  {
  	u32 val;
 diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/sprom.c
---- /dev/null	2008-03-14 08:48:03.721890422 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/sprom.c	2008-03-14 16:40:55.000000000 -0400
+--- /dev/null	2008-03-24 08:05:25.710634313 -0400
++++ linux-2.6.24.noarch/drivers/ssb/sprom.c	2008-03-24 16:43:58.000000000 -0400
 @@ -0,0 +1,133 @@
 +/*
 + * Sonics Silicon Backplane
@@ -79662,8 +75463,8 @@
 +	return err ? err : count;
 +}
 diff -up linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt
---- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig	2008-03-14 13:26:55.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt	2008-03-24 16:43:58.000000000 -0400
 @@ -80,7 +80,7 @@ once you enable the radio, will depend o
  e.g. With the BCM4318 on the Acer Aspire 5020 series:
  
@@ -79674,8 +75475,8 @@
  Wireless radio control is unconditionally enabled - all Acer laptops that support
  acer-wmi come with built-in wireless. However, should you feel so inclined to
 diff -up linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt
---- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt	2008-03-24 16:43:58.000000000 -0400
 @@ -1,89 +0,0 @@
 -
 -			BCM43xx Linux Driver Project
@@ -79767,8 +75568,8 @@
 -and CONFIG_IEEE80211_SOFTMAC_DEBUG. The log information provided is
 -essential for solving any problems.
 diff -up /dev/null linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl
---- /dev/null	2008-03-14 08:48:03.721890422 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl	2008-03-14 16:40:55.000000000 -0400
+--- /dev/null	2008-03-24 08:05:25.710634313 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl	2008-03-24 16:43:58.000000000 -0400
 @@ -0,0 +1,335 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -80106,8 +75907,8 @@
 +  </part>
 +</book>
 diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile
---- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig	2008-03-14 13:26:52.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/Makefile	2008-03-14 16:40:55.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile	2008-03-24 16:43:58.000000000 -0400
 @@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
  	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
@@ -80119,9 +75920,9 @@
  ###
  # The build process is as follows (targets):
 diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig	2008-03-14 13:26:54.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt	2008-03-14 16:40:55.000000000 -0400
-@@ -240,33 +240,6 @@ Who:	Jean Delvare <khali at linux-fr.org>
+--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig	2008-03-24 16:43:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt	2008-03-24 16:43:58.000000000 -0400
+@@ -230,33 +230,6 @@ Who:	Jean Delvare <khali at linux-fr.org>
  
  ---------------------------
  




More information about the fedora-extras-commits mailing list