diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 09:02:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 09:02:36 -0700 |
| commit | 53431d0a3534263168c8ee576bad1c2c3a4cd9e0 (patch) | |
| tree | 84b3dda2e2409d1eda7c2273053c78cd6aa3a677 /drivers/input/keyboard | |
| parent | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (diff) | |
| parent | ade9c1a47c811a7ae1c874882ad9178af1ed1098 (diff) | |
| download | blackbird-obmc-linux-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.tar.gz blackbird-obmc-linux-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/imx_keypad.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index d2ea863d6a45..2165f3dd328b 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -5,8 +5,6 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * - * <<Power management needs to be implemented>>. */ #include <linux/clk.h> |
