Merge ^/head r304955 through r304964.
authordim <dim@FreeBSD.org>
Sun, 28 Aug 2016 19:48:08 +0000 (19:48 +0000)
committerdim <dim@FreeBSD.org>
Sun, 28 Aug 2016 19:48:08 +0000 (19:48 +0000)
commit38a0015667eea53328f8be1a5cb7c8b0c3cc1008
tree379be31a2f917628535ce7523152f6f39bff3318
parentdc594bc495b6e4f2b85c82e2781545a352e9ee67
Merge ^/head r304955 through r304964.
13 files changed:
contrib/ipfilter/opts.h
sys/contrib/ipfilter/netinet/ip_compat.h
sys/contrib/ipfilter/netinet/ip_fil.h
sys/contrib/ipfilter/netinet/ip_log.c
sys/contrib/ipfilter/netinet/ip_nat.h
sys/contrib/ipfilter/netinet/ip_proxy.h
sys/ddb/db_expr.c
sys/dev/bhnd/bcma/bcma.c
sys/dev/bhnd/bhnd.h
sys/dev/bhnd/bhnd_bus_if.m
sys/dev/bhnd/siba/siba.c
sys/i386/i386/machdep.c
sys/modules/Makefile