Author: Sebastien Roy <Sebastien.Roy at Sun.COM> Changeset: 7661:0fd5e8e0b1c4 Comments: fix more stuff trashed by hg merge
Files: usr/src/uts/common/inet/arp/arp_netinfo.c usr/src/uts/common/inet/ipnet/ipnet.c
Author: Sebastien Roy <Sebastien.Roy at Sun.COM> Changeset: 7661:0fd5e8e0b1c4 Comments: fix more stuff trashed by hg merge
Files: usr/src/uts/common/inet/arp/arp_netinfo.c usr/src/uts/common/inet/ipnet/ipnet.c