diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 17:40:44 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 17:40:44 +0200 |
commit | 4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d (patch) | |
tree | 257c871b0be4c7eafa0e6911ab596bfb0f51a104 /drivers/media/usb/em28xx/em28xx-input.c | |
parent | 7781edaed63e9396fc913e0899cb197562e6f1a0 (diff) | |
parent | 76aa3de7095f15af7300012cb29ea8ab93eec348 (diff) | |
download | talos-op-linux-4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d.tar.gz talos-op-linux-4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d.zip |
Merge tag 'at24-4.17-rc5-fixes-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current
Single bug-fix for a regression introduced during the 4.17 merge window.
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-input.c')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index 2dc1be00b8b8..f84a1208d5d3 100644 --- a/drivers/media/usb/em28xx/em28xx-input.c +++ b/drivers/media/usb/em28xx/em28xx-input.c @@ -4,7 +4,7 @@ // // Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it> // Markus Rechberger <mrechberger@gmail.com> -// Mauro Carvalho Chehab <mchehab@infradead.org> +// Mauro Carvalho Chehab <mchehab@kernel.org> // Sascha Sommer <saschasommer@freenet.de> // // This program is free software; you can redistribute it and/or modify |