diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 12:26:29 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 12:26:29 -0400 |
| commit | f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1 (patch) | |
| tree | 650c1748df35728e2bce1b8c26c064bfea272f63 /include/linux/platform_data | |
| parent | 469d7d22cea146e40efe8c330e5164b4d8f13934 (diff) | |
| parent | 84c88ef9affb34f10cb5b66b07e2d496845d1c28 (diff) | |
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2010 ST Microelectronics | 2 | * Copyright (C) 2010 ST Microelectronics |
| 3 | * Rajeev Kumar<rajeev-dlh.kumar@st.com> | 3 | * Rajeev Kumar <rajeevkumar.linux@gmail.com> |
| 4 | * | 4 | * |
| 5 | * This file is licensed under the terms of the GNU General Public | 5 | * This file is licensed under the terms of the GNU General Public |
| 6 | * License version 2. This program is licensed "as is" without any | 6 | * License version 2. This program is licensed "as is" without any |