diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 19:43:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 19:43:23 -0800 |
| commit | 28e1445c650035668514df6f446c81f89990ac52 (patch) | |
| tree | c2e15675eb23c5ac3ca6841b1851abb95929f351 /include/linux/timerqueue.h | |
| parent | c015b4ad2ae57e5f07a5d4f746835356056c8e03 (diff) | |
| parent | 494c1eac7e73f719af9d474a96ec8494c33efd6a (diff) | |
Merge branch 'tty-linus' into 'tty-testing'
We need the fixes in drivers/tty/tty_io.c that were done in there for
future patches in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions