summaryrefslogtreecommitdiff
path: root/include/linux/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-05-18 07:10:28 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-05-18 07:10:28 +0300
commit2969869bfac3cb8c549f6cadea6b97bb1d9ec86f (patch)
tree50a585182a13e7ebe587ea1cf34f06272c218b02 /include/linux/input
parent04e49867fad1f4a0739862bb15133f96ace1d190 (diff)
parentd34fced41e172fae2df7819b1d5a398c62067599 (diff)
downloadlinux-2969869bfac3cb8c549f6cadea6b97bb1d9ec86f.tar.xz
Merge branch 'for-linus' into next
Merge for-linus branch to sync Elan touchscreen driver code.
Diffstat (limited to 'include/linux/input')
-rw-r--r--include/linux/input/lm8333.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input/lm8333.h b/include/linux/input/lm8333.h
index 79f918c6e8c5..906da5fc06e0 100644
--- a/include/linux/input/lm8333.h
+++ b/include/linux/input/lm8333.h
@@ -1,6 +1,6 @@
/*
* public include for LM8333 keypad driver - same license as driver
- * Copyright (C) 2012 Wolfram Sang, Pengutronix <w.sang@pengutronix.de>
+ * Copyright (C) 2012 Wolfram Sang, Pengutronix <kernel@pengutronix.de>
*/
#ifndef _LM8333_H