Merge branch 'master' into for-next

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1571c0c..40a9c32 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>
 
 ---------------------------