aboutsummaryrefslogtreecommitdiffstats
path: root/series
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-04-29 15:27:40 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-29 15:27:40 -0700
commit027449812d45e32d9eaa2f19f43ecf27d983c48d (patch)
treedbe6991bae624062795127077d56654d6ce9ab8b /series
parent2de09971da57e908bdccb050ffcb54ff27966804 (diff)
downloadpatches-027449812d45e32d9eaa2f19f43ecf27d983c48d.tar.gz
2.6.25-git14 resync
Diffstat (limited to 'series')
-rw-r--r--series2
1 files changed, 1 insertions, 1 deletions
diff --git a/series b/series
index 947203b132fc3c..226f6261251157 100644
--- a/series
+++ b/series
@@ -19,7 +19,7 @@ driver-core/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch
# PM suspend rework
driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch
driver-core/pm-new-suspend-and-hibernation-callbacks-for-platform-bus-type.patch
-driver-core/pm-new-suspend-and-hibernation-callbacks-for-pci-bus-type.patch
+#driver-core/pm-new-suspend-and-hibernation-callbacks-for-pci-bus-type.patch
# class device conversion work
driver-core/driver-core-remove-no-longer-used-struct-class_device.patch