]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b4d82dc) | patch
Fix mismerge in r312117. This is a direct commit to stable/10.
authornp <np@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 17 Jan 2017 07:43:37 +0000 (07:43 +0000)
committernp <np@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 17 Jan 2017 07:43:37 +0000 (07:43 +0000)
commita28bf5d971e2e3d02427c8a21ae87ed38d3e7bed
tree23d33c01ead9f0361912741d6fc550309ec48972tree | snapshot
parentb4d82dc10e6d6469689bbeb31ff2ad9bff8e9861commit | diff
Fix mismerge in r312117.  This is a direct commit to stable/10.

git-svn-id: svn://svn.freebsd.org/base/stable/10@312337 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/dev/cxgbe/tom/t4_ddp.c diff | blob | history
10-STABLE