From e29849bea2ec76d46bebe894ae2e145e3c5fd6db Mon Sep 17 00:00:00 2001
From: n_hibma <n_hibma@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 31 May 2016 21:21:32 +0000
Subject: [PATCH] Fixup botched merge in rev. r300488.

This commit only updates mergeinfo, not sys/net/if.c.


git-svn-id: svn://svn.freebsd.org/base/stable/10@301078 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
-- 
2.45.0