diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
| commit | 4b96583869c4d990b779eca72976063970d41b8d (patch) | |
| tree | f2fdb7760a06f6445f33fdee3ec512fbdb46fcb4 /drivers/media/usb/em28xx/em28xx.h | |
| parent | 53667c670fe00d63246fb3cfb4480bb1ba247bcc (diff) | |
| parent | 67b8d5c7081221efa252e111cd52532ec6d4266f (diff) | |
| download | linux-next-4b96583869c4d990b779eca72976063970d41b8d.tar.gz | |
Merge tag 'v4.17-rc5' into irq/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 63c7c6124707..b0378e77ddff 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -4,7 +4,7 @@ * * Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com> * Ludovico Cavedon <cavedon@sssup.it> - * Mauro Carvalho Chehab <mchehab@infradead.org> + * Mauro Carvalho Chehab <mchehab@kernel.org> * Copyright (C) 2012 Frank Schäfer <fschaefer.oss@googlemail.com> * * Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de> |