diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-19 16:36:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-19 16:36:18 -0700 |
| commit | 9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0 (patch) | |
| tree | ecd334957a0c62bcd4fe2fe9feea53ba9a6905cf /fs/btrfs/dev-replace.c | |
| parent | Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (diff) | |
| parent | devpts: clean up interface to pty drivers (diff) | |
| download | wireguard-linux-9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0.tar.xz wireguard-linux-9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0.zip | |
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
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions