summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-07-26 23:12:47 -0400
committerTom Rini <trini@konsulko.com>2018-07-26 23:12:47 -0400
commit2ae23a280be660c5c3dc8addb7f61bf7c12242f7 (patch)
tree46adac0e233201045e737d46ec00d8d4f39d69c1 /doc
parent53885e76ce8dca29782b211c2c83ad37c41d798a (diff)
parentab948cd21d25ba2f54832fc98a59eea90e680eba (diff)
downloadu-boot-2ae23a280be660c5c3dc8addb7f61bf7c12242f7.tar.gz
u-boot-2ae23a280be660c5c3dc8addb7f61bf7c12242f7.tar.bz2
u-boot-2ae23a280be660c5c3dc8addb7f61bf7c12242f7.zip
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'doc')
-rw-r--r--doc/driver-model/README.txt2
-rw-r--r--doc/git-mailrc4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/driver-model/README.txt b/doc/driver-model/README.txt
index 0853477578..d6fa5c4857 100644
--- a/doc/driver-model/README.txt
+++ b/doc/driver-model/README.txt
@@ -695,7 +695,7 @@ steps (see device_probe()):
allocate it yourself in ofdata_to_platdata(). Note that it is preferable
to do all the device tree decoding in ofdata_to_platdata() rather than
in probe(). (Apart from the ugliness of mixing configuration and run-time
- data, one day it is possible that U-Boot will cache platformat data for
+ data, one day it is possible that U-Boot will cache platform data for
devices which are regularly de/activated).
h. The device's probe() method is called. This should do anything that
diff --git a/doc/git-mailrc b/doc/git-mailrc
index 75aa675c08..bf8f2a5b69 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -20,7 +20,7 @@ alias alisonwang Alison Wang <alison.wang@nxp.com>
alias angelo_ts Angelo Dureghello <angelo@sysam.it>
alias bmeng Bin Meng <bmeng.cn@gmail.com>
alias danielschwierzeck Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
-alias dinh Dinh Nguyen <dinguyen@kernel.org>
+alias dinh Dinh Nguyen <dinguyen@kernel.org>
alias hs Heiko Schocher <hs@denx.de>
alias iwamatsu Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
alias jaehoon Jaehoon Chung <jh80.chung@samsung.com>
@@ -33,7 +33,7 @@ alias marex Marek Vasut <marex@denx.de>
alias mariosix Mario Six <mario.six@gdsys.cc>
alias masahiro Masahiro Yamada <yamada.masahiro@socionext.com>
alias mateusz Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
-alias maxime Maxime Ripard <maxime.ripard@free-electrons.com>
+alias maxime Maxime Ripard <maxime.ripard@free-electrons.com>
alias monstr Michal Simek <monstr@monstr.eu>
alias prafulla Prafulla Wadaskar <prafulla@marvell.com>
alias prom Minkyu Kang <mk7.kang@samsung.com>