DragonFly-2.1.1.224.g8a27f master sys/dev/misc/syscons syscons.c sys/dev/netif/cx cx.c sys/dev/netif/wi if_wi.c sys/dev/netif/wl if_wl.c sys/kern vfs_syscalls.c vfs_vnops.c sys/net/bridge if_bridge.c sys/netinet in.c ip_carp.c ip_output.c tcp_subr.c sys/netinet6 in6.c in6_src.c ip6_input.c sys/netproto/ipx ipx_usrreq.c sys/platform/pc64/amd64 machdep.c sys/vfs/hammer hammer.h sys/vm vm_swap.c

[Michael Neumann]

commit 8a27f1c965140ec72dd069582960c64ba9ecf534
Merge: 79809ae1bb322874bf8f741f0842fc20395bd18b 57962f80aecf03c023853992fea471246a0adc3a
Author: Michael Neumann <mneumann at ntecs.de>
Date:   Wed Dec 31 13:06:40 2008 +0000

    Merge branches 'master' and 'suser_to_priv'
    
    Conflicts:
    
    	sys/netinet/ip_carp.c
    	sys/platform/pc64/amd64/machdep.c

Summary of changes:

http://gitweb.dragonflybsd.org/?p=dragonfly.git;a=commitdiff;h=8a27f1c965140ec72dd069582960c64ba9ecf534


-- 
DragonFly BSD source repository