gitweb.dragonflybsd.org Git - dragonfly.git/commit

nant's projects / dragonfly.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 79809ae 57962f8)

author	Michael Neumann <mneumann@ntecs.de>
	Wed, 31 Dec 2008 13:06:40 +0000 (13:06 +0000)
committer	Michael Neumann <mneumann@ntecs.de>
	Wed, 31 Dec 2008 13:06:40 +0000 (13:06 +0000)
commit	8a27f1c965140ec72dd069582960c64ba9ecf534
tree	3aa52abb387ff011f21ebc40f50873be097d19e2	tree \| snapshot
parent	79809ae1bb322874bf8f741f0842fc20395bd18b	commit \| diff
parent	57962f80aecf03c023853992fea471246a0adc3a	commit \| diff

Merge branches 'master' and 'suser_to_priv'

Conflicts:

sys/netinet/ip_carp.c
sys/platform/pc64/amd64/machdep.c

18 files changed:

sys/dev/misc/syscons/syscons.c	diff1 \|	diff2 \|	blob \| history
sys/dev/netif/cx/cx.c	diff1 \|	diff2 \|	blob \| history
sys/dev/netif/wi/if_wi.c	diff1 \|	diff2 \|	blob \| history
sys/dev/netif/wl/if_wl.c	diff1 \|	diff2 \|	blob \| history
sys/kern/vfs_syscalls.c	diff1 \|	diff2 \|	blob \| history
sys/kern/vfs_vnops.c	diff1 \|	diff2 \|	blob \| history
sys/net/bridge/if_bridge.c	diff1 \|	diff2 \|	blob \| history
sys/netinet/in.c	diff1 \|	diff2 \|	blob \| history
sys/netinet/ip_carp.c	diff1 \|	diff2 \|	blob \| history
sys/netinet/ip_output.c	diff1 \|	diff2 \|	blob \| history
sys/netinet/tcp_subr.c	diff1 \|	diff2 \|	blob \| history
sys/netinet6/in6.c	diff1 \|	diff2 \|	blob \| history
sys/netinet6/in6_src.c	diff1 \|	diff2 \|	blob \| history
sys/netinet6/ip6_input.c	diff1 \|	diff2 \|	blob \| history
sys/netproto/ipx/ipx_usrreq.c	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/amd64/machdep.c	diff1 \|	diff2 \|	blob \| history
sys/vfs/hammer/hammer.h	diff1 \|	diff2 \|	blob \| history
sys/vm/vm_swap.c	diff1 \|	diff2 \|	blob \| history

Nuno's DragonFly repo.