diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:18:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:18:16 +0200 |
| commit | 9ccd8d744592b594db217b80af651e3f10e6a96e (patch) | |
| tree | 7321748b8c5b1621e618f5fed16216124c44e734 /drivers/tty/vt | |
| parent | abf1e0a98083fd0a1069ce68ad8c92bfb97a57db (diff) | |
| parent | a71c9a1c779f2499fb2afc0553e543f18aff6edf (diff) | |
Merge 4.11-rc5 into tty-next
We want the serial fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
| -rw-r--r-- | drivers/tty/vt/keyboard.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index c5f0fc906136..8af8d9542663 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -28,7 +28,6 @@ #include <linux/module.h> #include <linux/sched/signal.h> #include <linux/sched/debug.h> -#include <linux/sched/debug.h> #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/mm.h> |