]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 68f6165) | patch
Fixup botched merge in rev. r300488.
authorn_hibma <n_hibma@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 31 May 2016 21:21:32 +0000 (21:21 +0000)
committern_hibma <n_hibma@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 31 May 2016 21:21:32 +0000 (21:21 +0000)
commite29849bea2ec76d46bebe894ae2e145e3c5fd6db
treeb9ec305bb2d3684c155f3ca23c82f63f68f9cf94tree | snapshot
parent68f6165c748aac077050744d8e2453fd26686061commit | diff
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
10-STABLE