Merge ^/head r277844 through r277857.
authordim <dim@FreeBSD.org>
Wed, 28 Jan 2015 21:40:22 +0000 (21:40 +0000)
committerdim <dim@FreeBSD.org>
Wed, 28 Jan 2015 21:40:22 +0000 (21:40 +0000)
commit7bf38febfd913e4ded24422999eb8023902f617a
tree53575754e33f7c55ce643565ad9e8d208776aa8b
parente375b19ff6a7fcefee296772f9b6a0da0b5194e6
Merge ^/head r277844 through r277857.
12 files changed:
etc/rc.d/ipfilter
sys/fs/fdescfs/fdesc_vfsops.c
sys/kern/kern_jail.c
sys/sys/jail.h
usr.sbin/binmiscctl/binmiscctl.c
usr.sbin/jail/jail.8
usr.sbin/pciconf/pciconf.c
usr.sbin/ppp/command.c
usr.sbin/ppp/ipcp.c
usr.sbin/ppp/ipv6cp.c
usr.sbin/ppp/radius.c
usr.sbin/ppp/server.c