]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
Propagate merge-info from sys/net to sys for r206024.
authorbz <bz@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 2 Apr 2010 14:37:55 +0000 (14:37 +0000)
committerbz <bz@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 2 Apr 2010 14:37:55 +0000 (14:37 +0000)
commit3114bd54e758dca0973dcb6c3f0fdea5a34bccd1
tree56a3a1f02b59fe8a103e50b42f8f0b1841befd55
parentebdb1f86ab33c46c27716d68a901c28549b08dce
Propagate merge-info from sys/net to sys for r206024.
Also record mergeinfo for r206042.

git-svn-id: svn://svn.freebsd.org/base/stable/8@206096 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f