| commit | 249f3c4fe4fdef159d3f9b3f7a6c41a92103c860 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Feb 14 14:36:04 2016 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Feb 14 14:36:04 2016 -0800 |
| tree | 58abfec8444741fd3bd403a908be50c4f63d4842 | |
| parent | 54573c4a073ff510d028f423ed3074573c7d9437 [diff] | |
| parent | 18558cae0272f8fd9647e69d3fec1565a7949865 [diff] |
Merge 4.5-rc4 into tty-next We want the fixes in here, and this resolves a merge error in tty_io.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>