Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Jul 2007 16:48:51 GMT
From:      Matt Jacob <mjacob@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 123657 for review
Message-ID:  <200707171648.l6HGmp40045484@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=123657

Change 123657 by mjacob@mjexp on 2007/07/17 16:47:59

	IFC

Affected files ...

.. //depot/projects/mjexp/Makefile.inc1#12 integrate
.. //depot/projects/mjexp/ObsoleteFiles.inc#21 integrate
.. //depot/projects/mjexp/UPDATING#20 integrate
.. //depot/projects/mjexp/bin/sh/var.c#4 integrate
.. //depot/projects/mjexp/contrib/hostapd/COPYING#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ChangeLog#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/FREEBSD-Xlist#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/FREEBSD-upgrade#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/Makefile#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/README#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/accounting.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/accounting.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/aes.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/aes.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/aes_wrap.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/aes_wrap.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ap.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ap_list.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/ap_list.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/beacon.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/beacon.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/build_config.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/common.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/common.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/config.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/config.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/config_types.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/crypto.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/crypto.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ctrl_iface.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ctrl_iface.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/defconfig#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/defs.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/des.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/code_structure.doxygen#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/doxygen.fast#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/doxygen.full#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/eap.doxygen#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/hostapd.fig#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/mainpage.doxygen#1 branch
.. //depot/projects/mjexp/contrib/hostapd/doc/porting.doxygen#1 branch
.. //depot/projects/mjexp/contrib/hostapd/driver.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/driver_test.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/driver_wired.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_aka.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_defs.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_gpsk.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_gpsk_common.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_gpsk_common.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_gtc.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_i.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_identity.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_md5.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_methods.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_methods.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_mschapv2.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_pax.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_pax_common.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_pax_common.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_peap.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_psk.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_psk_common.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_psk_common.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_sake.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_sake_common.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_sake_common.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eap_sim.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_sim_common.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_sim_common.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_sim_db.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_sim_db.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_tls.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_tls_common.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_tls_common.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_tlv.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_ttls.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_ttls.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eap_vendor_test.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eapol_sm.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eapol_sm.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eapol_version.patch#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eloop.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eloop.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/eloop_none.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/eloop_win.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/hlr_auc_gw.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch
.. //depot/projects/mjexp/contrib/hostapd/hostap_common.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hostapd.8#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hostapd.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hostapd.conf#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hostapd.eap_user#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hostapd.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hostapd.vlan#1 branch
.. //depot/projects/mjexp/contrib/hostapd/hostapd_cli.1#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hostapd_cli.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/hw_features.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/hw_features.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/iapp.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/iapp.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ieee802_11.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ieee802_11.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ieee802_11_auth.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ieee802_11_auth.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ieee802_11h.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/ieee802_11h.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/ieee802_1x.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ieee802_1x.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/includes.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/l2_packet.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/l2_packet_none.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/md4.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/md5.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/md5.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/milenage.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/milenage.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/mlme.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/mlme.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/ms_funcs.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/ms_funcs.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/os.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/os_internal.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/os_none.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/os_unix.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/pmksa_cache.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/pmksa_cache.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/preauth.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/preauth.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/radius.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/radius.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/radius_client.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/radius_client.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/radius_server.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/radius_server.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/rc4.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/rc4.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/reconfig.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/sha1.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/sha1.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/sha256.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/sha256.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/sta_info.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/sta_info.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/state_machine.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/tls.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/tls_gnutls.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/tls_none.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/tls_openssl.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/version.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/vlan_init.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/vlan_init.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/wme.c#1 branch
.. //depot/projects/mjexp/contrib/hostapd/wme.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/wpa.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/wpa.h#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/wpa_common.h#1 branch
.. //depot/projects/mjexp/contrib/hostapd/wpa_ctrl.c#2 integrate
.. //depot/projects/mjexp/contrib/hostapd/wpa_ctrl.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/COPYING#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/ChangeLog#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/README#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/aes.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/aes.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/aes_wrap.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/aes_wrap.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/asn1.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/asn1.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/asn1_test.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/base64.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/base64.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/bignum.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/bignum.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/build_config.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/common.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/common.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/config.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/config.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/config_file.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/config_none.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/config_ssid.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/config_types.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/config_winreg.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/crypto.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/crypto.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/crypto_cryptoapi.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/crypto_gnutls.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/crypto_internal.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/crypto_none.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface_udp.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ctrl_iface_unix.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/dbus_dict_helpers.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/dbus_dict_helpers.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/defconfig#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/defs.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/des.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/code_structure.doxygen#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/doxygen.fast#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/doxygen.full#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/eap.doxygen#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/mainpage.doxygen#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/porting.doxygen#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/driver.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/driver_hostap.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/driver_ndis.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/driver_ndis.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/driver_ndis_.c#2 delete
.. //depot/projects/mjexp/contrib/wpa_supplicant/driver_wired.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/drivers.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_aka.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_defs.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_fast.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_gpsk.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_gpsk_common.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_gpsk_common.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_gtc.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_i.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_leap.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_md5.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_methods.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_methods.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_otp.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_pax.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_pax_common.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_pax_common.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_peap.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_psk.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_psk_common.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_psk_common.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_sake.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_sake_common.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_sake_common.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_sim.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_sim_common.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_sim_common.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_testing.txt#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_tls.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_tls_common.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_tls_common.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_tlv.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_tlv.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_ttls.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_ttls.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eap_vendor_test.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eapol_sm.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eapol_sm.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eapol_test.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eloop.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eloop.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/eloop_none.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/eloop_win.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/events.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/hostapd.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/includes.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/l2_packet.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/libtommath.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/main.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/md4.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/md5.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/md5.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/mlme.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/mlme.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/ms_funcs.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/ms_funcs.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/nmake.mak#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/os.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/os_internal.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/os_none.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/os_unix.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/pmksa_cache.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/pmksa_cache.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/preauth.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/preauth.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/preauth_test.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/radius.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/radius.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/radius_client.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/radius_client.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/rc4.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/rc4.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/rsa.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/rsa.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/sha1.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/sha1.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/sha256.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/sha256.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/state_machine.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/tls.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/tls_gnutls.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/tls_internal.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/tls_none.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/tls_openssl.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/tls_schannel.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/tlsv1_client.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/tlsv1_client.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/tlsv1_common.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/tlsv1_common.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/todo.txt#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/version.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_cli.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_common.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 delete
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 delete
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 delete
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 delete
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 delete
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_i.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate
.. //depot/projects/mjexp/contrib/wpa_supplicant/x509v3.c#1 branch
.. //depot/projects/mjexp/contrib/wpa_supplicant/x509v3.h#1 branch
.. //depot/projects/mjexp/etc/Makefile#3 integrate
.. //depot/projects/mjexp/etc/inetd.conf#2 integrate
.. //depot/projects/mjexp/etc/mtree/BSD.include.dist#11 integrate
.. //depot/projects/mjexp/etc/mtree/BSD.usr.dist#6 integrate
.. //depot/projects/mjexp/include/Makefile#10 integrate
.. //depot/projects/mjexp/lib/Makefile#5 integrate
.. //depot/projects/mjexp/lib/libarchive/Makefile#13 integrate
.. //depot/projects/mjexp/lib/libarchive/archive.h.in#14 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_read_open_memory.c#5 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#13 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_util.c#6 integrate
.. //depot/projects/mjexp/lib/libarchive/test/Makefile#8 integrate
.. //depot/projects/mjexp/lib/libarchive/test/main.c#5 integrate
.. //depot/projects/mjexp/lib/libarchive/test/read_open_memory.c#1 branch
.. //depot/projects/mjexp/lib/libarchive/test/test.h#4 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_acl_basic.c#4 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_acl_pax.c#4 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_archive_api_feature.c#3 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_entry.c#2 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_read_compress_program.c#2 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_read_format_ar.c#4 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_read_format_tar.c#2 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_read_pax_truncated.c#1 branch
.. //depot/projects/mjexp/lib/libarchive/test/test_tar_filenames.c#5 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_write_compress_program.c#2 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_write_disk.c#3 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_write_disk_perms.c#5 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_write_disk_secure.c#3 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_write_format_ar.c#5 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_write_format_cpio.c#2 integrate
.. //depot/projects/mjexp/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate
.. //depot/projects/mjexp/lib/libc/amd64/SYS.h#3 integrate
.. //depot/projects/mjexp/lib/libc/amd64/sys/Makefile.inc#2 integrate
.. //depot/projects/mjexp/lib/libc/arm/SYS.h#2 integrate
.. //depot/projects/mjexp/lib/libc/arm/sys/Makefile.inc#2 integrate
.. //depot/projects/mjexp/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/mjexp/lib/libc/gen/__getosreldate.c#1 branch
.. //depot/projects/mjexp/lib/libc/i386/SYS.h#3 integrate
.. //depot/projects/mjexp/lib/libc/i386/sys/Makefile.inc#2 integrate
.. //depot/projects/mjexp/lib/libc/ia64/SYS.h#2 integrate
.. //depot/projects/mjexp/lib/libc/ia64/sys/Makefile.inc#2 integrate
.. //depot/projects/mjexp/lib/libc/include/libc_private.h#3 integrate
.. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#8 integrate
.. //depot/projects/mjexp/lib/libc/powerpc/sys/Makefile.inc#2 integrate
.. //depot/projects/mjexp/lib/libc/quad/Makefile.inc#2 integrate
.. //depot/projects/mjexp/lib/libc/sparc64/SYS.h#3 integrate
.. //depot/projects/mjexp/lib/libc/sparc64/sys/Makefile.inc#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/Makefile.inc#6 integrate
.. //depot/projects/mjexp/lib/libc/sys/ftruncate.c#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/ioctl.2#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/lseek.c#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/mmap.c#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/pread.c#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/pwrite.c#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/truncate.c#3 integrate
.. //depot/projects/mjexp/lib/libgssapi/gss_display_status.c#3 integrate
.. //depot/projects/mjexp/libexec/rtld-elf/Symbol.map#4 integrate
.. //depot/projects/mjexp/libexec/rtld-elf/sparc64/reloc.c#3 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#21 integrate
.. //depot/projects/mjexp/rescue/rescue/Makefile#5 integrate
.. //depot/projects/mjexp/sbin/atm/Makefile#2 integrate
.. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#13 integrate
.. //depot/projects/mjexp/sbin/ifconfig/iflagg.c#3 integrate
.. //depot/projects/mjexp/sbin/ping6/Makefile#3 integrate
.. //depot/projects/mjexp/share/examples/Makefile#3 integrate
.. //depot/projects/mjexp/share/examples/isdn/FAQ#2 integrate
.. //depot/projects/mjexp/share/examples/isdn/Overview#2 integrate
.. //depot/projects/mjexp/share/examples/isdn/contrib/hplay.c#2 integrate
.. //depot/projects/mjexp/share/examples/isdn/contrib/isdntelmux.c#2 integrate
.. //depot/projects/mjexp/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate
.. //depot/projects/mjexp/share/examples/isdn/v21/v21modem.c#2 integrate
.. //depot/projects/mjexp/share/man/man4/snd_hda.4#9 integrate
.. //depot/projects/mjexp/share/man/man4/wi.4#4 integrate
.. //depot/projects/mjexp/share/man/man9/taskqueue.9#2 integrate
.. //depot/projects/mjexp/share/syscons/keymaps/INDEX.keymaps#3 integrate
.. //depot/projects/mjexp/share/syscons/keymaps/Makefile#3 integrate
.. //depot/projects/mjexp/share/syscons/keymaps/fr.macbook.acc.kbd#1 branch
.. //depot/projects/mjexp/share/zoneinfo/leapseconds#4 integrate
.. //depot/projects/mjexp/sys/Makefile#6 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#16 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/Makefile.inc#5 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/boot2/board.h#2 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/boot2/boot2.c#5 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/boot2/bwct_board.c#1 branch
.. //depot/projects/mjexp/sys/boot/arm/at91/boot2/centipad_board.c#1 branch
.. //depot/projects/mjexp/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/libat91/Makefile#5 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#5 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/libat91/emac.c#6 integrate
.. //depot/projects/mjexp/sys/boot/arm/at91/libat91/emac.h#4 integrate
.. //depot/projects/mjexp/sys/coda/00READ#2 delete
.. //depot/projects/mjexp/sys/coda/README#2 delete
.. //depot/projects/mjexp/sys/coda/TODO#2 delete
.. //depot/projects/mjexp/sys/coda/cnode.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_fbsd.c#2 delete
.. //depot/projects/mjexp/sys/coda/coda_io.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_kernel.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_namecache.c#2 delete
.. //depot/projects/mjexp/sys/coda/coda_namecache.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_opstats.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_pioctl.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_psdev.c#2 delete
.. //depot/projects/mjexp/sys/coda/coda_psdev.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_subr.c#2 delete
.. //depot/projects/mjexp/sys/coda/coda_subr.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_venus.c#2 delete
.. //depot/projects/mjexp/sys/coda/coda_venus.h#2 delete
.. //depot/projects/mjexp/sys/coda/coda_vfsops.c#2 delete
.. //depot/projects/mjexp/sys/coda/coda_vfsops.h#3 delete
.. //depot/projects/mjexp/sys/coda/coda_vnops.c#6 delete
.. //depot/projects/mjexp/sys/coda/coda_vnops.h#4 delete
.. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_misc.c#7 integrate
.. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/mjexp/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/mjexp/sys/compat/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_file.c#7 integrate
.. //depot/projects/mjexp/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/mjexp/sys/conf/NOTES#29 integrate
.. //depot/projects/mjexp/sys/conf/files#32 integrate
.. //depot/projects/mjexp/sys/conf/files.amd64#11 integrate
.. //depot/projects/mjexp/sys/conf/files.i386#11 integrate
.. //depot/projects/mjexp/sys/conf/kern.pre.mk#6 integrate
.. //depot/projects/mjexp/sys/conf/kmod.mk#8 integrate
.. //depot/projects/mjexp/sys/conf/options#25 integrate
.. //depot/projects/mjexp/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/mjexp/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate
.. //depot/projects/mjexp/sys/contrib/pf/net/pf_subr.c#3 integrate
.. //depot/projects/mjexp/sys/dev/cxgb/cxgb_adapter.h#7 integrate
.. //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#11 integrate
.. //depot/projects/mjexp/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ed/if_ed_pccard.c#4 integrate
.. //depot/projects/mjexp/sys/dev/fb/splash_bmp.c#2 integrate
.. //depot/projects/mjexp/sys/dev/firewire/firewire.c#9 integrate
.. //depot/projects/mjexp/sys/dev/firewire/firewirereg.h#6 integrate
.. //depot/projects/mjexp/sys/dev/if_ndis/if_ndis.c#7 integrate
.. //depot/projects/mjexp/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ipw/if_ipw.c#7 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp.c#27 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#31 integrate
.. //depot/projects/mjexp/sys/dev/ixgbe/LICENSE#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe.c#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe.h#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_82598.c#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_api.c#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_api.h#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_common.c#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_common.h#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_osdep.h#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_phy.c#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_phy.h#1 branch
.. //depot/projects/mjexp/sys/dev/ixgbe/ixgbe_type.h#1 branch
.. //depot/projects/mjexp/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mxge/eth_z8e.dat.gz.uu#5 integrate
.. //depot/projects/mjexp/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#18 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge_var.h#7 integrate
.. //depot/projects/mjexp/sys/dev/mxge/mcp_gen_header.h#2 integrate
.. //depot/projects/mjexp/sys/dev/mxge/mxge_lro.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mxge/mxge_mcp.h#4 integrate
.. //depot/projects/mjexp/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ofw/openfirm.c#4 integrate
.. //depot/projects/mjexp/sys/dev/pccard/pccarddevs#3 integrate
.. //depot/projects/mjexp/sys/dev/re/if_re.c#13 integrate
.. //depot/projects/mjexp/sys/dev/rp/rp.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sbni/if_sbni.c#3 integrate
.. //depot/projects/mjexp/sys/dev/snp/snp.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#10 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/es137x.c#9 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#17 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac_private.h#7 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#11 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.c#11 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_rue.c#6 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_ruereg.h#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/ubser.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/udbp.c#6 integrate
.. //depot/projects/mjexp/sys/dev/usb/umass.c#11 integrate
.. //depot/projects/mjexp/sys/dev/usb/usb_port.h#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/usb_quirks.c#7 integrate
.. //depot/projects/mjexp/sys/dev/usb/usbdevs#17 integrate
.. //depot/projects/mjexp/sys/dev/usb/uvisor.c#6 integrate
.. //depot/projects/mjexp/sys/dev/usb/uvscom.c#7 integrate
.. //depot/projects/mjexp/sys/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/mjexp/sys/dev/wi/if_wi.c#8 integrate
.. //depot/projects/mjexp/sys/fs/coda/README#1 branch
.. //depot/projects/mjexp/sys/fs/coda/TODO#1 branch
.. //depot/projects/mjexp/sys/fs/coda/cnode.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_fbsd.c#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_io.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_kernel.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_namecache.c#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_namecache.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_opstats.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_pioctl.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_psdev.c#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_psdev.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_subr.c#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_subr.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_venus.c#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_venus.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_vfsops.c#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_vfsops.h#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_vnops.c#1 branch
.. //depot/projects/mjexp/sys/fs/coda/coda_vnops.h#1 branch
.. //depot/projects/mjexp/sys/fs/msdosfs/bpb.h#4 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_fat.c#4 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate
.. //depot/projects/mjexp/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs.h#4 integrate
.. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_subr.c#4 integrate
.. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate
.. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/mjexp/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/mjexp/sys/i386/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/mjexp/sys/i386/i386/sys_machdep.c#7 integrate
.. //depot/projects/mjexp/sys/i386/i386/vm_machdep.c#8 integrate
.. //depot/projects/mjexp/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate
.. //depot/projects/mjexp/sys/i386/include/i4b_cause.h#2 delete
.. //depot/projects/mjexp/sys/i386/include/i4b_debug.h#2 delete
.. //depot/projects/mjexp/sys/i386/include/i4b_ioctl.h#2 delete
.. //depot/projects/mjexp/sys/i386/include/i4b_rbch_ioctl.h#2 delete
.. //depot/projects/mjexp/sys/i386/include/i4b_tel_ioctl.h#2 delete
.. //depot/projects/mjexp/sys/i386/include/i4b_trace.h#2 delete
.. //depot/projects/mjexp/sys/i386/include/pc/vesa.h#2 integrate
.. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#13 integrate
.. //depot/projects/mjexp/sys/i4b/capi/capi_l4if.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/capi/capi_llif.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/capi/capi_msgs.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_card.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_isa.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_lli.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_pci.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/driver/i4b_ctl.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/driver/i4b_ing.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/driver/i4b_ipr.c#5 integrate
.. //depot/projects/mjexp/sys/i4b/driver/i4b_isppp.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/driver/i4b_rbch.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/driver/i4b_tel.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/driver/i4b_trace.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/include/i4b_cause.h#1 branch
.. //depot/projects/mjexp/sys/i4b/include/i4b_debug.h#1 branch
.. //depot/projects/mjexp/sys/i4b/include/i4b_ioctl.h#1 branch
.. //depot/projects/mjexp/sys/i4b/include/i4b_l1l2.h#2 integrate
.. //depot/projects/mjexp/sys/i4b/include/i4b_rbch_ioctl.h#1 branch
.. //depot/projects/mjexp/sys/i4b/include/i4b_tel_ioctl.h#1 branch
.. //depot/projects/mjexp/sys/i4b/include/i4b_trace.h#1 branch
.. //depot/projects/mjexp/sys/i4b/layer1/i4b_l1dmux.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/i4b_l1lib.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_diva.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_isac.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_isic.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_isic_pnp.c#4 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_l1.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_sws.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_usr_sti.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_iframe.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_l2.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_l2fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_l2timer.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_lme.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_sframe.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_tei.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_uframe.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer2/i4b_util.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer3/i4b_l2if.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer3/i4b_l3fsm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer3/i4b_l3timer.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer3/i4b_l4if.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer3/i4b_q931.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer3/i4b_q932fac.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer4/i4b_l4.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer4/i4b_l4timer.c#2 integrate
.. //depot/projects/mjexp/sys/ia64/isa/isa_dma.c#2 integrate
.. //depot/projects/mjexp/sys/kern/Make.tags.inc#6 integrate
.. //depot/projects/mjexp/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_conf.c#8 integrate
.. //depot/projects/mjexp/sys/kern/kern_event.c#6 integrate
.. //depot/projects/mjexp/sys/kern/kern_exec.c#10 integrate
.. //depot/projects/mjexp/sys/kern/kern_resource.c#15 integrate
.. //depot/projects/mjexp/sys/kern/kern_sx.c#12 integrate
.. //depot/projects/mjexp/sys/kern/makesyscalls.sh#3 integrate
.. //depot/projects/mjexp/sys/kern/subr_unit.c#3 integrate
.. //depot/projects/mjexp/sys/kern/sys_generic.c#9 integrate
.. //depot/projects/mjexp/sys/kern/syscalls.c#4 integrate
.. //depot/projects/mjexp/sys/kern/syscalls.master#4 integrate
.. //depot/projects/mjexp/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/mjexp/sys/kern/tty_pts.c#5 integrate
.. //depot/projects/mjexp/sys/kern/vfs_mount.c#15 integrate
.. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#15 integrate
.. //depot/projects/mjexp/sys/modules/Makefile#16 integrate
.. //depot/projects/mjexp/sys/modules/coda/Makefile#2 integrate
.. //depot/projects/mjexp/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/mjexp/sys/modules/netgraph/atm/Makefile#2 integrate
.. //depot/projects/mjexp/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#7 integrate
.. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#7 integrate
.. //depot/projects/mjexp/sys/net/if_lagg.c#7 integrate
.. //depot/projects/mjexp/sys/net/if_lagg.h#5 integrate
.. //depot/projects/mjexp/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/mjexp/sys/netatm/atm_proto.c#2 integrate
.. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/sctp.h#8 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#13 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_cc_functions.c#1 branch
.. //depot/projects/mjexp/sys/netinet/sctp_cc_functions.h#1 branch
.. //depot/projects/mjexp/sys/netinet/sctp_constants.h#12 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_indata.c#18 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_input.c#18 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_os.h#7 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_output.c#19 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#18 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_pcb.h#12 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_structs.h#14 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#8 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_sysctl.h#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_timer.c#13 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_timer.h#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#17 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_var.h#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctputil.c#20 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_input.c#19 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_subr.c#16 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_var.h#11 integrate
.. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#13 integrate
.. //depot/projects/mjexp/sys/netinet/udp_var.h#4 integrate
.. //depot/projects/mjexp/sys/netinet6/dest6.c#2 integrate
.. //depot/projects/mjexp/sys/netinet6/frag6.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/icmp6.c#7 integrate
.. //depot/projects/mjexp/sys/netinet6/in6.c#7 integrate
.. //depot/projects/mjexp/sys/netinet6/in6.h#4 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_cksum.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_gif.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_proto.c#8 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_src.c#7 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_forward.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_id.c#2 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_input.c#6 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_mroute.c#5 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_mroute.h#4 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_var.h#4 integrate
.. //depot/projects/mjexp/sys/netinet6/mld6.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/nd6.c#10 integrate
.. //depot/projects/mjexp/sys/netinet6/nd6_nbr.c#5 integrate
.. //depot/projects/mjexp/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/raw_ip6.c#7 integrate
.. //depot/projects/mjexp/sys/netinet6/route6.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/scope6.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#15 integrate
.. //depot/projects/mjexp/sys/netinet6/sctp6_var.h#6 integrate
.. //depot/projects/mjexp/sys/netinet6/udp6_output.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/udp6_usrreq.c#7 integrate
.. //depot/projects/mjexp/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/mjexp/sys/netsmb/smb_dev.c#4 integrate
.. //depot/projects/mjexp/sys/opencrypto/cast.c#2 integrate
.. //depot/projects/mjexp/sys/pc98/cbus/sio.c#3 integrate
.. //depot/projects/mjexp/sys/pc98/include/i4b_cause.h#2 delete
.. //depot/projects/mjexp/sys/pc98/include/i4b_debug.h#2 delete
.. //depot/projects/mjexp/sys/pc98/include/i4b_ioctl.h#2 delete
.. //depot/projects/mjexp/sys/pc98/include/i4b_rbch_ioctl.h#2 delete
.. //depot/projects/mjexp/sys/pc98/include/i4b_tel_ioctl.h#2 delete
.. //depot/projects/mjexp/sys/pc98/include/i4b_trace.h#2 delete
.. //depot/projects/mjexp/sys/pci/agp.c#4 integrate
.. //depot/projects/mjexp/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/mjexp/sys/pci/agppriv.h#2 integrate
.. //depot/projects/mjexp/sys/pci/agpreg.h#3 integrate
.. //depot/projects/mjexp/sys/pci/if_rlreg.h#6 integrate
.. //depot/projects/mjexp/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/mjexp/sys/security/mac/mac_policy.h#5 integrate
.. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate
.. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/mp_machdep.c#7 integrate
.. //depot/projects/mjexp/sys/sys/lock_profile.h#6 integrate
.. //depot/projects/mjexp/sys/sys/param.h#23 integrate
.. //depot/projects/mjexp/sys/sys/sx.h#10 integrate
.. //depot/projects/mjexp/sys/sys/syscall.h#4 integrate
.. //depot/projects/mjexp/sys/sys/syscall.mk#4 integrate
.. //depot/projects/mjexp/sys/sys/sysent.h#5 integrate
.. //depot/projects/mjexp/sys/sys/sysproto.h#4 integrate
.. //depot/projects/mjexp/sys/sys/systm.h#17 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#11 integrate
.. //depot/projects/mjexp/sys/vm/vm_fault.c#12 integrate
.. //depot/projects/mjexp/sys/vm/vm_meter.c#6 integrate
.. //depot/projects/mjexp/sys/vm/vm_mmap.c#7 integrate
.. //depot/projects/mjexp/sys/vm/vm_page.c#16 integrate
.. //depot/projects/mjexp/sys/vm/vm_page.h#7 integrate
.. //depot/projects/mjexp/sys/vm/vm_phys.c#3 integrate
.. //depot/projects/mjexp/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#11 integrate
.. //depot/projects/mjexp/tools/kerneldoc/subsys/Makefile#3 integrate
.. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.icase1.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.icase2.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.icase3.out#1 branch
.. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.sh#6 integrate
.. //depot/projects/mjexp/tools/tools/mfc/mfc.pl#2 integrate
.. //depot/projects/mjexp/usr.bin/gzip/gzip.c#3 integrate
.. //depot/projects/mjexp/usr.bin/kdump/kdump.c#6 integrate
.. //depot/projects/mjexp/usr.bin/kdump/mkioctls#2 integrate
.. //depot/projects/mjexp/usr.bin/sed/compile.c#2 integrate
.. //depot/projects/mjexp/usr.bin/sed/defs.h#2 integrate
.. //depot/projects/mjexp/usr.bin/sed/sed.1#3 integrate
.. //depot/projects/mjexp/usr.bin/telnet/Makefile#3 integrate
.. //depot/projects/mjexp/usr.sbin/Makefile#6 integrate
.. //depot/projects/mjexp/usr.sbin/dconschat/dconschat.c#5 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/g711conv/g711conv.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdnd/isdnd.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdnd/isdnd.h#3 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdndebug/main.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdndecode/decode.h#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdnmonitor/monprivate.h#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdnphone/defs.h#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdntel/defs.h#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdntelctl/main.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdntest/main.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/isdntrace/trace.h#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/man/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/i4b/man/i4b.4#2 integrate
.. //depot/projects/mjexp/usr.sbin/inetd/Makefile#3 integrate
.. //depot/projects/mjexp/usr.sbin/ppp/i4b.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/rrenumd/Makefile#3 integrate
.. //depot/projects/mjexp/usr.sbin/traceroute6/Makefile#3 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/hostapd/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/hostapd_cli/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/l2_packet.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/wpa_cli/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/wpa_passphrase/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/wpa_supplicant/Packet32.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate

Differences ...

==== //depot/projects/mjexp/Makefile.inc1#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -967,6 +967,7 @@
 .for _tool in \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc \
+    usr.bin/sed \
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \

==== //depot/projects/mjexp/ObsoleteFiles.inc#21 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.102 2007/07/03 13:06:45 mlaier Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.105 2007/07/12 00:02:12 dougb Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,21 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070705: I4B headers repo-copied to include/i4b/
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/include/machine/i4b_cause.h
+OLD_FILES+=usr/include/machine/i4b_debug.h
+OLD_FILES+=usr/include/machine/i4b_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_trace.h
+.endif
+# 20070704: I4B 'modules' temporary disconnected
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i4bing.4.gz
+OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
+OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
+.endif
 # 20070703: pf 4.1 import
 OLD_FILES+=usr/libexec/ftp-proxy
 # 20070701: KAME IPSec removal
@@ -44,6 +59,10 @@
 OLD_FILES+=usr/include/fs/umapfs/umap.h
 OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
 OLD_DIRS+=usr/include/fs/umapfs
+# 20070618: Removal of the PROTO.localhost* files
+OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev
+OLD_FILES+=etc/namedb/PROTO.localhost.rev
+OLD_FILES+=etc/namedb/make-localhost
 # 20070618: shared library version bump
 OLD_LIBS+=lib/libalias.so.5
 OLD_LIBS+=lib/libbsnmp.so.3

==== //depot/projects/mjexp/UPDATING#20 (text+ko) ====

@@ -21,6 +21,11 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070704:
+        The new IPsec code is now compiled in using the IPSEC option.  The
+	IPSEC option now requires "device crypto" be defined in your kernel
+	configuration.  The FAST_IPSEC kernel option is now deprecated.
+
 20070702:
 	The packet filter (pf) code has been updated to OpenBSD 4.1 Please
 	note the changed syntax - keep state is now on by default.  Also
@@ -42,6 +47,11 @@
 	information.
 
 20070612:
+	The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver
+	instead of the nve(4) driver. Please update your configuration
+	accordingly.
+
+20070612:
 	By default, /etc/rc.d/sendmail no longer rebuilds the aliases
 	database if it is missing or older than the aliases file.  If
 	desired, set the new rc.conf option sendmail_rebuild_aliases
@@ -877,4 +887,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.500 2007/07/03 13:06:44 mlaier Exp $
+$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $

==== //depot/projects/mjexp/bin/sh/var.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.36 2007/07/04 00:00:38 scf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -278,6 +278,30 @@
 	return 0;
 }
 
+
+/*
+ * Sets/unsets an environment variable from a pointer that may actually be a
+ * pointer into environ where the string should not be manipulated.
+ */
+static void
+change_env(char *s, int set)
+{
+	char *eqp;
+	char *ss;
+
+	ss = savestr(s);
+	if ((eqp = strchr(ss, '=')) != NULL)

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707171648.l6HGmp40045484>