aboutsummaryrefslogtreecommitdiffstats
path: root/series
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-10-20 11:38:11 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-20 11:38:11 -0700
commit17aaa9e417e12436b5646ed270ad6921a8e862bd (patch)
tree4c20aac3d35f05c2504da20cd8155e986b6ac60a /series
parent7babbfd23a92483e68710b3fa631be9f01246842 (diff)
downloadpatches-17aaa9e417e12436b5646ed270ad6921a8e862bd.tar.gz
2.6.27-git8
Also remove anything not aimed for 2.6.28 so -next can be sane for a bit
Diffstat (limited to 'series')
-rw-r--r--series15
1 files changed, 7 insertions, 8 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...