aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-13 09:02:02 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-13 09:02:02 -0700
commite6b88ef30ffe1805ffd78a2b689e3f464577e63d (patch)
treedceadac1eb73029134f9a05ebb31665ecb8d193c
parent65e21f5eba4ed9795bcf8368cf713f974e45cb14 (diff)
downloadpatches-e6b88ef30ffe1805ffd78a2b689e3f464577e63d.tar.gz
version refresh
-rw-r--r--devfs/devfs-remove-devfs_mk_dir.patch2
-rw-r--r--pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch2
-rw-r--r--usb/usb-ohci-avoids-root-hub-timer-polling.patch2
-rw-r--r--version2
4 files changed, 4 insertions, 4 deletions
diff --git a/devfs/devfs-remove-devfs_mk_dir.patch b/devfs/devfs-remove-devfs_mk_dir.patch
index 70e017ff5edba1..682f75d10769dc 100644
--- a/devfs/devfs-remove-devfs_mk_dir.patch
+++ b/devfs/devfs-remove-devfs_mk_dir.patch
@@ -388,7 +388,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- gregkh-2.6.orig/mm/shmem.c
+++ gregkh-2.6/mm/shmem.c
-@@ -2258,9 +2258,7 @@ static int __init init_tmpfs(void)
+@@ -2260,9 +2260,7 @@ static int __init init_tmpfs(void)
printk(KERN_ERR "Could not register tmpfs\n");
goto out2;
}
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
index 56b2dbef6688bc..9cbbba764386a0 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
@@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if ((dev = skge_devinit(hw, 0, using_dac)) == NULL)
--- gregkh-2.6.orig/drivers/net/sky2.c
+++ gregkh-2.6/drivers/net/sky2.c
-@@ -3302,9 +3302,9 @@ static int __devinit sky2_probe(struct p
+@@ -3305,9 +3305,9 @@ static int __devinit sky2_probe(struct p
if (err)
goto err_out_iounmap;
diff --git a/usb/usb-ohci-avoids-root-hub-timer-polling.patch b/usb/usb-ohci-avoids-root-hub-timer-polling.patch
index 58530d89e0229e..026efbce1c258c 100644
--- a/usb/usb-ohci-avoids-root-hub-timer-polling.patch
+++ b/usb/usb-ohci-avoids-root-hub-timer-polling.patch
@@ -250,7 +250,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.bus_resume = ohci_bus_resume,
--- gregkh-2.6.orig/drivers/usb/host/ohci-pxa27x.c
+++ gregkh-2.6/drivers/usb/host/ohci-pxa27x.c
-@@ -285,6 +285,7 @@ static const struct hc_driver ohci_pxa27
+@@ -288,6 +288,7 @@ static const struct hc_driver ohci_pxa27
*/
.hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control,
diff --git a/version b/version
index ab03a1cff005e5..5b910081822eb1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.17-rc6-git3
+2.6.17-rc6-git5