lentferj's projects / dragonfly.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | combined (merge: 6cef713 36a3d1d)
Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Sep 2010 09:25:58 +0000 (02:25 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Sep 2010 09:25:58 +0000 (02:25 -0700)
1  2 
sys/net/if.c patch | diff1 | diff2 | blob | history
sys/net/if_var.h patch | diff1 | diff2 | blob | history
sys/sys/mbuf.h patch | diff1 | diff2 | blob | history

diff --cc sys/net/if.c
Simple merge
diff --cc sys/net/if_var.h
Simple merge
diff --cc sys/sys/mbuf.h
Simple merge
lentferj's DragonFly repo