| commit | 9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 19 16:36:18 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 19 16:36:18 2016 -0700 |
| tree | ecd334957a0c62bcd4fe2fe9feea53ba9a6905cf | |
| parent | 12566cc35d0e68308bde7aad615743d560cb097b [diff] | |
| parent | 67245ff332064c01b760afa7a384ccda024bfd24 [diff] |
Merge branch 'ptmx-cleanup' Merge the ptmx internal interface cleanup branch. This doesn't change semantics, but it should be a sane basis for eventually getting the multi-instance devpts code into some sane shape where we can get rid of the kernel config option. Which we can hopefully get done next merge window.. * ptmx-cleanup: devpts: clean up interface to pty drivers