summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-03-22 23:20:49 -0400
committerLen Brown <len.brown@intel.com>2011-03-22 23:20:49 -0400
commit2935b544041bbdc32a6864ba9350a7629c56d722 (patch)
treede60ec2bbff1dfe8c1318d6eb02e3d7aae48d262 /Documentation
parent25076246e80c0c48cc4c9115335b83343b9dc727 (diff)
parent912b7427fc13467bac042cc72f2eccbdbc39d773 (diff)
downloadlinux-3.10-2935b544041bbdc32a6864ba9350a7629c56d722.tar.gz
linux-3.10-2935b544041bbdc32a6864ba9350a7629c56d722.tar.bz2
linux-3.10-2935b544041bbdc32a6864ba9350a7629c56d722.zip
Merge branch 'button-cleanup' into release
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b3f35e5f9c9..e4615253ba8 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -259,14 +259,6 @@ Who: Zhang Rui <rui.zhang@intel.com>
---------------------------
-What: /proc/acpi/button
-When: August 2007
-Why: /proc/acpi/button has been replaced by events to the input layer
- since 2.6.20.
-Who: Len Brown <len.brown@intel.com>
-
----------------------------
-
What: /proc/acpi/event
When: February 2008
Why: /proc/acpi/event has been replaced by events via the input layer