diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 09:26:29 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 09:26:29 -0700 |
| commit | f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1 (patch) | |
| tree | 650c1748df35728e2bce1b8c26c064bfea272f63 /include/linux/platform_data | |
| parent | Input: pixcir_i2c_ts - fix receive error (diff) | |
| parent | MAINTAINERS: remove non existent input mt git tree (diff) | |
| download | linux-dev-f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1.tar.xz linux-dev-f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.2 merge window.
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/keyboard-spear.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/keyboard-spear.h b/include/linux/platform_data/keyboard-spear.h index 9248e3a7e333..5e3ff653900c 100644 --- a/include/linux/platform_data/keyboard-spear.h +++ b/include/linux/platform_data/keyboard-spear.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar@st.com> + * Rajeev Kumar <rajeevkumar.linux@gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any |