Merge branch 'master' of git://github.com/cmcqueen/ppp
authorPaul Mackerras <paulus@samba.org>
Fri, 1 Aug 2014 11:41:27 +0000 (21:41 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 1 Aug 2014 11:41:27 +0000 (21:41 +1000)
commitf8c05f21cc743132fb7c4b996568c09a374725b9
tree8529d9b0aeb5c396afef724e3c17b6d7de22f1f2
parent2b05e22c62095e97dd0a97e4b5588402c2185071
parentad993a20ee485f0d0e2ac4105221641b200da6e2
Merge branch 'master' of git://github.com/cmcqueen/ppp

This merges in one commit, which adds the new "stop-bits" option.

Signed-off-by: Paul Mackerras <paulus@samba.org>
pppd/pppd.h
pppd/sys-linux.c