Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[safe/jmp/linux-2.6] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 9cf9d83..66c8b4b 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -27,7 +27,6 @@ Who:  Hans Verkuil <hverkuil@xs4all.nl> and
 ---------------------------
 
 What:  dev->power.power_state
-       dpm_runtime_{suspend,resume)()
 When:  July 2007
 Why:   Broken design for runtime control over driver power states, confusing
        driver-internal runtime power management with:  mechanisms to support
@@ -309,3 +308,13 @@ Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64
 Who:  linuxppc-dev@ozlabs.org
 
 ---------------------------
+
+What:  mthca driver's MSI support
+When:  January 2008
+Files: drivers/infiniband/hw/mthca/*.[ch]
+Why:   All mthca hardware also supports MSI-X, which provides
+       strictly more functionality than MSI.  So there is no point in
+       having both MSI-X and MSI support in the driver.
+Who:   Roland Dreier <rolandd@cisco.com>
+
+---------------------------