svn commit: r301078 - stable/10

[Nick Hibma]

Author: n_hibma
Date: Tue May 31 21:21:32 2016
New Revision: 301078
URL: https://svnweb.freebsd.org/changeset/base/301078

Log:
  Fixup botched merge in rev. r300488.
  
  This commit only updates mergeinfo, not sys/net/if.c.

Modified:
Directory Properties:
  stable/10/   (props changed)