diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-11 11:57:11 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-11 11:57:11 -0700 |
| commit | 14af953f878bbc3b026ee166fc44e61cd29a0f88 (patch) | |
| tree | d20f692b8431f1078de414e8eecaa08990ac66ab | |
| parent | 8c1cb69ee05d3f759227e86e8bce0c49189b1cd2 (diff) | |
| download | patches-14af953f878bbc3b026ee166fc44e61cd29a0f88.tar.gz | |
version update
| -rw-r--r-- | driver/network-class_device-to-device.patch | 4 | ||||
| -rw-r--r-- | i2c/i2c-new-mailing-list.patch | 6 | ||||
| -rw-r--r-- | i2c/i2c-plan-ite-bus-driver-for-removal.patch | 2 | ||||
| -rw-r--r-- | i2c/w1-remove-w1-mail-list-from-lm_sensors.patch | 2 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/driver/network-class_device-to-device.patch b/driver/network-class_device-to-device.patch index 4c8d0f4f77e6d4..e273a9221efa86 100644 --- a/driver/network-class_device-to-device.patch +++ b/driver/network-class_device-to-device.patch @@ -860,7 +860,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/net/wireless/spectrum_cs.c +++ gregkh-2.6/drivers/net/wireless/spectrum_cs.c -@@ -822,7 +822,7 @@ spectrum_cs_config(struct pcmcia_device +@@ -817,7 +817,7 @@ spectrum_cs_config(struct pcmcia_device /* Finally, report what we've done */ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " @@ -1336,7 +1336,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!err) { hlist_del(&dev->name_hlist); hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name)); -@@ -3223,8 +3223,8 @@ void free_netdev(struct net_device *dev) +@@ -3251,8 +3251,8 @@ void free_netdev(struct net_device *dev) BUG_ON(dev->reg_state != NETREG_UNREGISTERED); dev->reg_state = NETREG_RELEASED; diff --git a/i2c/i2c-new-mailing-list.patch b/i2c/i2c-new-mailing-list.patch index 4bc08e6726ebd3..92dd79ce755919 100644 --- a/i2c/i2c-new-mailing-list.patch +++ b/i2c/i2c-new-mailing-list.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> S: Maintained ALPHA PORT -@@ -1240,7 +1240,7 @@ S: Maintained +@@ -1249,7 +1249,7 @@ S: Maintained I2C SUBSYSTEM P: Jean Delvare M: khali@linux-fr.org @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> W: http://www.lm-sensors.nu/ T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S: Maintained -@@ -2084,7 +2084,7 @@ S: Maintained +@@ -2093,7 +2093,7 @@ S: Maintained OPENCORES I2C BUS DRIVER P: Peter Korsgaard M: jacmet@sunsite.dk @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> S: Maintained ORACLE CLUSTER FILESYSTEM 2 (OCFS2) -@@ -3118,7 +3118,7 @@ S: Maintained +@@ -3132,7 +3132,7 @@ S: Maintained VIAPRO SMBUS DRIVER P: Jean Delvare M: khali@linux-fr.org diff --git a/i2c/i2c-plan-ite-bus-driver-for-removal.patch b/i2c/i2c-plan-ite-bus-driver-for-removal.patch index 93b97506f16462..e05d6eaabee584 100644 --- a/i2c/i2c-plan-ite-bus-driver-for-removal.patch +++ b/i2c/i2c-plan-ite-bus-driver-for-removal.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt +++ gregkh-2.6/Documentation/feature-removal-schedule.txt -@@ -258,3 +258,14 @@ Why: The interrupt related SA_* flags ar +@@ -247,3 +247,14 @@ Why: The interrupt related SA_* flags ar Who: Thomas Gleixner <tglx@linutronix.de> --------------------------- diff --git a/i2c/w1-remove-w1-mail-list-from-lm_sensors.patch b/i2c/w1-remove-w1-mail-list-from-lm_sensors.patch index af98a96d929268..31beb93458808b 100644 --- a/i2c/w1-remove-w1-mail-list-from-lm_sensors.patch +++ b/i2c/w1-remove-w1-mail-list-from-lm_sensors.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -3166,7 +3166,6 @@ S: Maintained +@@ -3180,7 +3180,6 @@ S: Maintained W1 DALLAS'S 1-WIRE BUS P: Evgeniy Polyakov M: johnpol@2ka.mipt.ru @@ -1 +1 @@ -2.6.18-rc1 +2.6.18-rc1-git4 |