aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-24 00:47:15 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-24 00:47:15 -0700
commit344fceebd77ff2e341f36f9821da096adcc3840f (patch)
tree41075c34be26195e9a57f9171d3ad8dfb0e444bb
parent7571d7f1b4b5bf610eff40186e0c2b59374f2ce5 (diff)
downloadpatches-344fceebd77ff2e341f36f9821da096adcc3840f.tar.gz
2.6.24-rc1 sync
-rw-r--r--gregkh/sysfs-test.patch2
-rw-r--r--version2
2 files changed, 2 insertions, 2 deletions
diff --git a/gregkh/sysfs-test.patch b/gregkh/sysfs-test.patch
index e8488eaa23183e..4d3268c1d70166 100644
--- a/gregkh/sysfs-test.patch
+++ b/gregkh/sysfs-test.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/Makefile
+++ b/drivers/Makefile
-@@ -92,3 +92,5 @@ obj-$(CONFIG_PPC_PS3) += ps3/
+@@ -91,3 +91,5 @@ obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
diff --git a/version b/version
index 3a698b40c49b99..864b1f28c39072 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.23-git19
+2.6.24-rc1