summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/keymaps/rc-kaiomy.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2018-05-23 11:05:26 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-05-23 11:05:59 +0200
commitdd8070bff204a67fcb6585f18047841a895b68d7 (patch)
treecce17d4b8eb8987194beb40498c8f83e74d6799f /drivers/media/rc/keymaps/rc-kaiomy.c
parentcfg80211: add missing kernel-doc (diff)
parentMerge branch 'qed-firmware-TLV' (diff)
downloadlinux-dd8070bff204a67fcb6585f18047841a895b68d7.tar.xz
linux-dd8070bff204a67fcb6585f18047841a895b68d7.zip
Merge remote-tracking branch 'net-next/master' into mac80211-next
Bring in net-next which had pulled in net, so I have the changes from mac80211 and can apply a patch that would otherwise conflict. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/media/rc/keymaps/rc-kaiomy.c')
-rw-r--r--drivers/media/rc/keymaps/rc-kaiomy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/keymaps/rc-kaiomy.c b/drivers/media/rc/keymaps/rc-kaiomy.c
index f0f88df18606..a00051339842 100644
--- a/drivers/media/rc/keymaps/rc-kaiomy.c
+++ b/drivers/media/rc/keymaps/rc-kaiomy.c
@@ -9,7 +9,7 @@
#include <linux/module.h>
/* Kaiomy TVnPC U2
- Mauro Carvalho Chehab <mchehab@infradead.org>
+ Mauro Carvalho Chehab <mchehab@kernel.org>
*/
static struct rc_map_table kaiomy[] = {