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
sys/net/if_var.h
sys/sys/mbuf.h

diff --cc sys/net/if.c
Simple merge
Simple merge
diff --cc sys/sys/mbuf.h
Simple merge