diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-21 11:12:42 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-21 11:12:42 -0700 |
| commit | 48853389f206b689260ddfd3006816779ca7a52a (patch) | |
| tree | 8abc3be612779c3252190bc54a38eb0b3c258e19 /drivers/input/keyboard | |
| parent | 85a3685852d9ac7d92be9d824533c915a4597fa4 (diff) | |
| parent | c9eeb5084b27ffede2709e8775827729d0c7c46c (diff) | |
| download | linux-48853389f206b689260ddfd3006816779ca7a52a.tar.bz2 | |
Merge branch 'next' into for-linus
Prepare second round of updates for 4.1 merge window.
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/lm8333.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/lm8333.c b/drivers/input/keyboard/lm8333.c index 9081cbef11ea..0ad422b8a260 100644 --- a/drivers/input/keyboard/lm8333.c +++ b/drivers/input/keyboard/lm8333.c @@ -1,6 +1,6 @@ /* * LM8333 keypad driver - * Copyright (C) 2012 Wolfram Sang, Pengutronix <w.sang@pengutronix.de> + * Copyright (C) 2012 Wolfram Sang, Pengutronix <kernel@pengutronix.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -231,6 +231,6 @@ static struct i2c_driver lm8333_driver = { }; module_i2c_driver(lm8333_driver); -MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>"); +MODULE_AUTHOR("Wolfram Sang <kernel@pengutronix.de>"); MODULE_DESCRIPTION("LM8333 keyboard driver"); MODULE_LICENSE("GPL v2"); |