diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 17:38:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 17:38:51 +0200 |
| commit | b99dc74253980287c826b8158327fc8f2ff03dad (patch) | |
| tree | 05271a97e9e64987555009cd7486a6813b798446 /include/media/videobuf-core.h | |
| parent | Merge tag 'sound-4.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| parent | MAINTAINERS & files: Canonize the e-mails I use at files (diff) | |
| download | linux-b99dc74253980287c826b8158327fc8f2ff03dad.tar.xz linux-b99dc74253980287c826b8158327fc8f2ff03dad.zip | |
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 'include/media/videobuf-core.h')
| -rw-r--r-- | include/media/videobuf-core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 0bda0adc744f..60a664febba0 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -1,11 +1,11 @@ /* * generic helper functions for handling video4linux capture buffers * - * (c) 2007 Mauro Carvalho Chehab, <mchehab@infradead.org> + * (c) 2007 Mauro Carvalho Chehab, <mchehab@kernel.org> * * Highly based on video-buf written originally by: * (c) 2001,02 Gerd Knorr <kraxel@bytesex.org> - * (c) 2006 Mauro Carvalho Chehab, <mchehab@infradead.org> + * (c) 2006 Mauro Carvalho Chehab, <mchehab@kernel.org> * (c) 2006 Ted Walther and John Sokol * * This program is free software; you can redistribute it and/or modify |