aboutsummaryrefslogtreecommitdiffstats
path: root/series
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-05-16 11:40:42 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-05-16 11:40:42 -0700
commitfa85fcfe976353f1ec893a3b5bdeb3f483bc75f6 (patch)
treea00251a382c54e181f1c6162f51bb1b4126a890a /series
parentce9a255921ea1c72bec651559cb85348bf8a8bd5 (diff)
downloadpatches-fa85fcfe976353f1ec893a3b5bdeb3f483bc75f6.tar.gz
pci fixes and testing patches
Diffstat (limited to 'series')
-rw-r--r--series4
1 files changed, 4 insertions, 0 deletions
diff --git a/series b/series
index 5a668973862b4..3c7bfc63dbdda 100644
--- a/series
+++ b/series
@@ -144,6 +144,10 @@ pci/sgi-hotplug-incorrect-power-status.patch
pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch
pci/pci-hotplug-fix-recovery-path-from-errors-during-pcie_init.patch
+# do not merge, for testing only
+pci/pci-test-that-drivers-properly-call-pci_set_master.patch
+
+
# usb patches queued for 2.6.17 (bugfixes, new ids, etc.)
# stuff after 2.6.17 is out