diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
| commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch) | |
| tree | de701f5c90b7373966412d566b5c00d3837954bc /doc/feature-removal-schedule.txt | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
| parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
| download | u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'doc/feature-removal-schedule.txt')
| -rw-r--r-- | doc/feature-removal-schedule.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt index 16819c7..4ed30df 100644 --- a/doc/feature-removal-schedule.txt +++ b/doc/feature-removal-schedule.txt @@ -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 --------------------------- |