commit | b3e3bf2ef2c74f5ce5c19510edbbb9bfc1d249c2 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Apr 07 11:07:20 2015 +0200 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Apr 07 11:07:20 2015 +0200 |
tree | 0fb24ebf81227b9f05e44f717a8c4997d837b667 | |
parent | fbf47635315ab308c9b58a1ea0906e711a9228de [diff] | |
parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 [diff] |
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>