SPECS (LINUX_2_6): kernel.spec - 3com/ibm patch reordered to avoid...

[pluto]

Author: pluto                        Date: Sun Jul 31 13:18:41 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- 3com/ibm patch reordered to avoid conflict with acpi patch.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1148 -> 1.441.2.1149) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1148 SPECS/kernel.spec:1.441.2.1149
--- SPECS/kernel.spec:1.441.2.1148	Sun Jul 31 15:08:59 2005
+++ SPECS/kernel.spec	Sun Jul 31 15:18:35 2005
@@ -183,7 +183,7 @@
 Patch15:	linux-2.6-enable-broken-advansys.patch
 Patch16:	linux-alpha-isa.patch
 Patch17:	linux-fbcon-margins.patch
-Patch18:	linux-2.6-3Com_IBM-fix.patch
+
 Patch19:	2.6.5-3C920b-Tornado.patch
 Patch20:	2.6.5-i386-cmpxchg.patch
 Patch21:	2.6.6-serial-fifo-lkml.patch
@@ -248,6 +248,7 @@
 Patch110:	linux-2.6-cputime-misscalculation.patch
 Patch111:	linux-2.6-vfs-two-read-without-clear-between.patch
 Patch112:	linux-2.6-via82c586-irq-routing.patch
+Patch113:	linux-2.6-3Com_IBM-fix.patch
 
 # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/
 Patch135:	linux-2.6-unix-abi.patch
@@ -616,7 +617,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
+
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
@@ -668,6 +669,7 @@
 %patch110 -p1
 %patch111 -p1
 %patch112 -p1
+%patch113 -p1
 
 %ifarch %{ix86}
 %patch135 -p1
@@ -1444,6 +1446,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1149  2005/07/31 13:18:35  pluto
+- 3com/ibm patch reordered to avoid conflict with acpi patch.
+
 Revision 1.441.2.1148  2005/07/31 13:08:59  pluto
 - added support for via epia vt1211 sensor.
 - fixed suspend/resume pci issue on 3com cards on ibm's notebooks.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1148&r2=1.441.2.1149&f=u