OSDN Git Service

Merge changes Ib0ab1722,Id5b1b351
authorLorenzo Colitti <lorenzo@google.com>
Fri, 18 Dec 2015 06:02:06 +0000 (06:02 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 18 Dec 2015 06:02:06 +0000 (06:02 +0000)
commitabf5656527ec767fdf306fbf703f73a10e4ae3d6
tree504bf2f5b74690eafc93a93f14a97d87bbe91d0c
parentf2f800951aa3ec920a719556d71c2fbee734209d
parentf2dffc46c435e1260185eb525f237e862525c2be
Merge changes Ib0ab1722,Id5b1b351

* changes:
  Don't create TIME-WAIT sockets in CreateSocketPair.
  Add support for the sock_diag netlink interface.