Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / doc / feature-removal-schedule.txt

diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt
index 16819c7754410ba137a126d840e950e5e5e1b7a0..b5a70da2962a527216cad4abf58b971cd7b14e2d 100644 (file)
--- a/doc/feature-removal-schedule.txt
+++ b/doc/feature-removal-schedule.txt
@@ -12,7 +12,7 @@ When: Release v2013.10
 
 Why:   As the 'mtest' command is no longer default, a number of platforms
        have not opted to turn the command back on and thus provide unused
-       defines (which are likely to be propogated to new platforms from
+       defines (which are likely to be propagated to new platforms from
        copy/paste).  Remove these defines when unused.
 
 Who:   Tom Rini <trini@ti.com>
@@ -26,7 +26,7 @@ Why:  We now have a PHY library, which allows everyone to share PHY
        drivers. All new drivers should use this infrastructure, and
        all old drivers should get converted to use it.
 
-Who:   Andy Fleming <afleming@freescale.com> and driver maintainers
+Who:   Andy Fleming <afleming@gmail.com> and driver maintainers
 
 ---------------------------