| commit | 02730d3c053a9af1d402e1c8dc8bbbc5a1340406 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 18 14:08:58 2015 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 18 14:08:58 2015 -0700 |
| tree | db289a08de50eb4b5caf7840d5b7356ddfa1c51f | |
| parent | 77232f791e0605521a978cbe7f79a93df24df374 [diff] | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 [diff] |
Merge 4.1-rc4 into tty-next This resolves some tty driver merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>