diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-07 11:07:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-07 11:07:20 +0200 |
| commit | b3e3bf2ef2c74f5ce5c19510edbbb9bfc1d249c2 (patch) | |
| tree | 0fb24ebf81227b9f05e44f717a8c4997d837b667 /kernel/relay.c | |
| parent | tty: clean up the tty time logic a bit (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-b3e3bf2ef2c74f5ce5c19510edbbb9bfc1d249c2.tar.xz linux-b3e3bf2ef2c74f5ce5c19510edbbb9bfc1d249c2.zip | |
Merge 4.0-rc7 into tty-next
We want the fixes in here as well, also to help out with merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/relay.c')
0 files changed, 0 insertions, 0 deletions