summaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-18 14:08:58 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-18 14:08:58 -0700
commit02730d3c053a9af1d402e1c8dc8bbbc5a1340406 (patch)
treedb289a08de50eb4b5caf7840d5b7356ddfa1c51f /net/unix
parent77232f791e0605521a978cbe7f79a93df24df374 (diff)
parente26081808edadfd257c6c9d81014e3b25e9a6118 (diff)
downloadop-kernel-dev-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.zip
op-kernel-dev-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.gz
Merge 4.1-rc4 into tty-next
This resolves some tty driver merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud