summaryrefslogtreecommitdiffstats
path: root/Documentation/translations/zh_CN
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2018-05-15 10:41:01 +0200
committerWolfram Sang <wsa@the-dreams.de>2018-05-15 10:41:01 +0200
commite6218bf390a9992de86a535bcb227f75e2c20cf9 (patch)
treeb6bfa2374c78fedacb683b4da91afac3300807ba /Documentation/translations/zh_CN
parent77bade677c3c5616dfadfd21f0220fcddbfa4cbe (diff)
parent35cd67a0caf767aba472452865dcb4471fcce2b1 (diff)
downloadlinux-stable-e6218bf390a9992de86a535bcb227f75e2c20cf9.tar.gz
linux-stable-e6218bf390a9992de86a535bcb227f75e2c20cf9.tar.bz2
linux-stable-e6218bf390a9992de86a535bcb227f75e2c20cf9.zip
Merge branch 'i2c/for-current-fixed' into i2c/for-4.18
Diffstat (limited to 'Documentation/translations/zh_CN')
-rw-r--r--Documentation/translations/zh_CN/video4linux/v4l2-framework.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
index 698660b7f21f..c77c0f060864 100644
--- a/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
+++ b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
@@ -6,7 +6,7 @@ communicating in English you can also ask the Chinese maintainer for
help. Contact the Chinese maintainer if this translation is outdated
or if there is a problem with the translation.
-Maintainer: Mauro Carvalho Chehab <mchehab@infradead.org>
+Maintainer: Mauro Carvalho Chehab <mchehab@kernel.org>
Chinese maintainer: Fu Wei <tekkamanninja@gmail.com>
---------------------------------------------------------------------
Documentation/video4linux/v4l2-framework.txt 的中文翻译
@@ -14,7 +14,7 @@ Documentation/video4linux/v4l2-framework.txt 的中文翻译
如果想评论或更新本文的内容,请直接联系原文档的维护者。如果你使用英文
交流有困难的话,也可以向中文版维护者求助。如果本翻译更新不及时或者翻
译存在问题,请联系中文版维护者。
-英文版维护者: Mauro Carvalho Chehab <mchehab@infradead.org>
+英文版维护者: Mauro Carvalho Chehab <mchehab@kernel.org>
中文版维护者: 傅炜 Fu Wei <tekkamanninja@gmail.com>
中文版翻译者: 傅炜 Fu Wei <tekkamanninja@gmail.com>
中文版校译者: 傅炜 Fu Wei <tekkamanninja@gmail.com>