Merge branch 'master' into for-next

[mv-sheeva.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1571c0c83dba0b0876ea52e4ff85ff69a56dab87..40a9c323931905a99447f90084584eb7eb420128 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -93,7 +93,7 @@ Why:  Broken design for runtime control over driver power states, confusing
        inputs.  This framework was never widely used, and most attempts to
        use it were broken.  Drivers should instead be exposing domain-specific
        interfaces either to kernel or to userspace.
-Who:   Pavel Machek <pavel@suse.cz>
+Who:   Pavel Machek <pavel@ucw.cz>
 
 ---------------------------