aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--series15
-rw-r--r--version2
2 files changed, 8 insertions, 9 deletions
diff --git a/series b/series
index 25878933f2f575..e6724d81123435 100644
--- a/series
+++ b/series
@@ -20,7 +20,6 @@ driver-core.current/document-kernel-taint-flags-properly.patch
usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabled.patch
-
#####################################################################
# Stuff to be merged after 2.6.28 is out
#####################################################################
@@ -31,14 +30,14 @@ usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabl
# multi driver-to-device series
-driver-core/driver-core-use-dev_get_drvdata-accessors.patch
-driver-core/acpi-fixup-typo-in-acpi_device_remove.patch
+#driver-core/driver-core-use-dev_get_drvdata-accessors.patch
+#driver-core/acpi-fixup-typo-in-acpi_device_remove.patch
# for .28
-driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch
+#driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch
# helper tools, not for mainline.
-driver-core/warn-when-statically-allocated-kobjects-are-used.patch
+#driver-core/warn-when-statically-allocated-kobjects-are-used.patch
#################################
# USB stuff (after 2.6.27 is out)
@@ -57,7 +56,7 @@ usb/usb-remove-info-macro-from-usb.h.patch
# my ols tutorial driver, never in mainline
-usb/usb-gotemp.patch
+#usb/usb-gotemp.patch
#################################
# Staging stuff
@@ -65,8 +64,8 @@ usb/usb-gotemp.patch
staging/staging-add-pcc-acpi-driver.patch
# can not even compile :(
-staging/usb-add-princeton-instruments-usb-camera-driver.patch
-staging/oms-add-oms-maxp-driver.patch
+#staging/usb-add-princeton-instruments-usb-camera-driver.patch
+#staging/oms-add-oms-maxp-driver.patch
# not quite working yet...
diff --git a/version b/version
index 29312711636fa7..b79be476ac4399 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.27-git7
+2.6.27-git8