summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-09-11 09:02:36 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-09-11 09:02:36 -0700
commit53431d0a3534263168c8ee576bad1c2c3a4cd9e0 (patch)
tree84b3dda2e2409d1eda7c2273053c78cd6aa3a677 /drivers/input/keyboard
parent01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (diff)
parentade9c1a47c811a7ae1c874882ad9178af1ed1098 (diff)
downloadop-kernel-dev-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.zip
op-kernel-dev-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.tar.gz
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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index d2ea863..2165f3d 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>
OpenPOWER on IntegriCloud