diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 05:38:51 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 05:38:51 -1000 |
| commit | b99dc74253980287c826b8158327fc8f2ff03dad (patch) | |
| tree | 05271a97e9e64987555009cd7486a6813b798446 /Documentation/sphinx/parse-headers.pl | |
| parent | dac1acc3c216b09e04f173b3c1b94f1760ab3078 (diff) | |
| parent | 3259081991a9398434f6f49468b960f136ac0158 (diff) | |
Merge tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- a trivial one-line fix addressing a PTR_ERR() getting value from a
wrong var at imx driver
- a patch changing my e-mail at the Kernel tree to mchehab@kernel.org.
no code changes
* tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
MAINTAINERS & files: Canonize the e-mails I use at files
media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR
Diffstat (limited to 'Documentation/sphinx/parse-headers.pl')
| -rwxr-xr-x | Documentation/sphinx/parse-headers.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/sphinx/parse-headers.pl b/Documentation/sphinx/parse-headers.pl index a958d8b5e99d..d410f47567e9 100755 --- a/Documentation/sphinx/parse-headers.pl +++ b/Documentation/sphinx/parse-headers.pl @@ -387,11 +387,11 @@ tree for more details. =head1 BUGS -Report bugs to Mauro Carvalho Chehab <mchehab@s-opensource.com> +Report bugs to Mauro Carvalho Chehab <mchehab@kernel.org> =head1 COPYRIGHT -Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab@s-opensource.com>. +Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab+samsung@kernel.org>. License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>. |