From owner-svn-src-user@FreeBSD.ORG  Fri Apr 26 15:48:09 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B45A9223;
 Fri, 26 Apr 2013 15:48:09 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A30B51FCB;
 Fri, 26 Apr 2013 15:48:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QFm9TO037241;
 Fri, 26 Apr 2013 15:48:09 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3QFm0h6037163;
 Fri, 26 Apr 2013 15:48:00 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201304261548.r3QFm0h6037163@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 26 Apr 2013 15:48:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r249932 - in user/adrian/net80211_tx: . bin/cat bin/dd
 bin/df bin/domainname bin/sh cddl/contrib/opensolaris/lib/libdtrace/common
 cddl/contrib/opensolaris/lib/libzfs/common contrib/bsnm...
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Apr 2013 15:48:09 -0000

Author: adrian
Date: Fri Apr 26 15:48:00 2013
New Revision: 249932
URL: http://svnweb.freebsd.org/changeset/base/249932

Log:
  Merge from head.

Added:
  user/adrian/net80211_tx/sys/boot/fdt/dts/am335x.dtsi
     - copied unchanged from r249931, head/sys/boot/fdt/dts/am335x.dtsi
Deleted:
  user/adrian/net80211_tx/gnu/usr.bin/cc/f77/
  user/adrian/net80211_tx/gnu/usr.bin/cc/f771/
  user/adrian/net80211_tx/gnu/usr.bin/cc/f77doc/
Modified:
  user/adrian/net80211_tx/Makefile.inc1
  user/adrian/net80211_tx/UPDATING
  user/adrian/net80211_tx/bin/cat/cat.c
  user/adrian/net80211_tx/bin/dd/dd.c
  user/adrian/net80211_tx/bin/df/df.c
  user/adrian/net80211_tx/bin/domainname/domainname.1
  user/adrian/net80211_tx/bin/sh/sh.1
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  user/adrian/net80211_tx/contrib/bsnmp/snmp_mibII/mibII.c
  user/adrian/net80211_tx/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  user/adrian/net80211_tx/crypto/openssh/readconf.c
  user/adrian/net80211_tx/crypto/openssh/readconf.h
  user/adrian/net80211_tx/crypto/openssh/ssh.c
  user/adrian/net80211_tx/gnu/usr.bin/gdb/kgdb/trgt_mips.c
  user/adrian/net80211_tx/include/stringlist.h
  user/adrian/net80211_tx/lib/libc/gen/stringlist.3
  user/adrian/net80211_tx/lib/libc/gen/stringlist.c
  user/adrian/net80211_tx/lib/libc/stdio/asprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/clrerr.c
  user/adrian/net80211_tx/lib/libc/stdio/fclose.c
  user/adrian/net80211_tx/lib/libc/stdio/fdopen.c
  user/adrian/net80211_tx/lib/libc/stdio/feof.c
  user/adrian/net80211_tx/lib/libc/stdio/ferror.c
  user/adrian/net80211_tx/lib/libc/stdio/fflush.c
  user/adrian/net80211_tx/lib/libc/stdio/fgetc.c
  user/adrian/net80211_tx/lib/libc/stdio/fgetln.c
  user/adrian/net80211_tx/lib/libc/stdio/fgetpos.c
  user/adrian/net80211_tx/lib/libc/stdio/fgets.c
  user/adrian/net80211_tx/lib/libc/stdio/fileno.c
  user/adrian/net80211_tx/lib/libc/stdio/findfp.c
  user/adrian/net80211_tx/lib/libc/stdio/flags.c
  user/adrian/net80211_tx/lib/libc/stdio/fopen.c
  user/adrian/net80211_tx/lib/libc/stdio/fprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/fpurge.c
  user/adrian/net80211_tx/lib/libc/stdio/fputc.c
  user/adrian/net80211_tx/lib/libc/stdio/fputs.c
  user/adrian/net80211_tx/lib/libc/stdio/fread.c
  user/adrian/net80211_tx/lib/libc/stdio/freopen.c
  user/adrian/net80211_tx/lib/libc/stdio/fscanf.c
  user/adrian/net80211_tx/lib/libc/stdio/fseek.c
  user/adrian/net80211_tx/lib/libc/stdio/fsetpos.c
  user/adrian/net80211_tx/lib/libc/stdio/ftell.c
  user/adrian/net80211_tx/lib/libc/stdio/funopen.c
  user/adrian/net80211_tx/lib/libc/stdio/fvwrite.c
  user/adrian/net80211_tx/lib/libc/stdio/fwalk.c
  user/adrian/net80211_tx/lib/libc/stdio/fwrite.c
  user/adrian/net80211_tx/lib/libc/stdio/getc.c
  user/adrian/net80211_tx/lib/libc/stdio/getchar.c
  user/adrian/net80211_tx/lib/libc/stdio/gets.c
  user/adrian/net80211_tx/lib/libc/stdio/getw.c
  user/adrian/net80211_tx/lib/libc/stdio/makebuf.c
  user/adrian/net80211_tx/lib/libc/stdio/mktemp.c
  user/adrian/net80211_tx/lib/libc/stdio/perror.c
  user/adrian/net80211_tx/lib/libc/stdio/printf-pos.c
  user/adrian/net80211_tx/lib/libc/stdio/printf.c
  user/adrian/net80211_tx/lib/libc/stdio/putc.c
  user/adrian/net80211_tx/lib/libc/stdio/putchar.c
  user/adrian/net80211_tx/lib/libc/stdio/puts.c
  user/adrian/net80211_tx/lib/libc/stdio/putw.c
  user/adrian/net80211_tx/lib/libc/stdio/refill.c
  user/adrian/net80211_tx/lib/libc/stdio/remove.c
  user/adrian/net80211_tx/lib/libc/stdio/rewind.c
  user/adrian/net80211_tx/lib/libc/stdio/rget.c
  user/adrian/net80211_tx/lib/libc/stdio/scanf.c
  user/adrian/net80211_tx/lib/libc/stdio/setbuf.c
  user/adrian/net80211_tx/lib/libc/stdio/setbuffer.c
  user/adrian/net80211_tx/lib/libc/stdio/setvbuf.c
  user/adrian/net80211_tx/lib/libc/stdio/snprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/sprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/sscanf.c
  user/adrian/net80211_tx/lib/libc/stdio/stdio.c
  user/adrian/net80211_tx/lib/libc/stdio/tempnam.c
  user/adrian/net80211_tx/lib/libc/stdio/tmpfile.c
  user/adrian/net80211_tx/lib/libc/stdio/tmpnam.c
  user/adrian/net80211_tx/lib/libc/stdio/ungetc.c
  user/adrian/net80211_tx/lib/libc/stdio/vfprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/vfscanf.c
  user/adrian/net80211_tx/lib/libc/stdio/vfwprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/vfwscanf.c
  user/adrian/net80211_tx/lib/libc/stdio/vprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/vscanf.c
  user/adrian/net80211_tx/lib/libc/stdio/vsnprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/vsprintf.c
  user/adrian/net80211_tx/lib/libc/stdio/vsscanf.c
  user/adrian/net80211_tx/lib/libc/stdio/vswscanf.c
  user/adrian/net80211_tx/lib/libc/stdio/wbuf.c
  user/adrian/net80211_tx/lib/libc/stdio/wsetup.c
  user/adrian/net80211_tx/lib/libc/sys/accept.2
  user/adrian/net80211_tx/lib/libc/sys/dup.2
  user/adrian/net80211_tx/lib/libc/sys/getdtablesize.2
  user/adrian/net80211_tx/lib/libvmmapi/vmmapi.c
  user/adrian/net80211_tx/lib/libvmmapi/vmmapi.h
  user/adrian/net80211_tx/sbin/camcontrol/camcontrol.8
  user/adrian/net80211_tx/sbin/camcontrol/camcontrol.c
  user/adrian/net80211_tx/sbin/dhclient/packet.c
  user/adrian/net80211_tx/sbin/etherswitchcfg/etherswitchcfg.8
  user/adrian/net80211_tx/sbin/etherswitchcfg/etherswitchcfg.c
  user/adrian/net80211_tx/sbin/geom/class/label/glabel.8
  user/adrian/net80211_tx/sbin/hastctl/hastctl.c
  user/adrian/net80211_tx/sbin/ifconfig/iflagg.c
  user/adrian/net80211_tx/sbin/newfs_nandfs/newfs_nandfs.c
  user/adrian/net80211_tx/sbin/tunefs/tunefs.c
  user/adrian/net80211_tx/share/man/man5/procfs.5
  user/adrian/net80211_tx/share/man/man9/counter.9
  user/adrian/net80211_tx/share/man/man9/ifnet.9
  user/adrian/net80211_tx/share/misc/committers-src.dot
  user/adrian/net80211_tx/share/misc/iso639
  user/adrian/net80211_tx/share/mk/bsd.progs.mk
  user/adrian/net80211_tx/share/syscons/keymaps/us.dvorakp.kbd
  user/adrian/net80211_tx/sys/amd64/include/vmm.h   (contents, props changed)
  user/adrian/net80211_tx/sys/amd64/vmm/intel/vmcs.c
  user/adrian/net80211_tx/sys/amd64/vmm/intel/vmcs.h
  user/adrian/net80211_tx/sys/amd64/vmm/intel/vmx.c
  user/adrian/net80211_tx/sys/amd64/vmm/vmm.c
  user/adrian/net80211_tx/sys/amd64/vmm/vmm_instruction_emul.c
  user/adrian/net80211_tx/sys/arm/arm/gic.c
  user/adrian/net80211_tx/sys/boot/fdt/dts/beaglebone.dts
  user/adrian/net80211_tx/sys/boot/i386/btx/btx/btx.S
  user/adrian/net80211_tx/sys/boot/pc98/btx/btx/btx.S
  user/adrian/net80211_tx/sys/cam/scsi/scsi_da.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/adrian/net80211_tx/sys/conf/NOTES
  user/adrian/net80211_tx/sys/conf/files.powerpc
  user/adrian/net80211_tx/sys/conf/options.mips
  user/adrian/net80211_tx/sys/dev/acpi_support/acpi_toshiba.c
  user/adrian/net80211_tx/sys/dev/acpica/acpi.c
  user/adrian/net80211_tx/sys/dev/acpica/acpi_pci_link.c
  user/adrian/net80211_tx/sys/dev/bktr/bktr_core.c
  user/adrian/net80211_tx/sys/dev/ciss/ciss.c
  user/adrian/net80211_tx/sys/dev/drm/mach64_dma.c
  user/adrian/net80211_tx/sys/dev/etherswitch/arswitch/arswitch.c
  user/adrian/net80211_tx/sys/dev/etherswitch/etherswitch.h
  user/adrian/net80211_tx/sys/dev/etherswitch/rtl8366/rtl8366rb.c
  user/adrian/net80211_tx/sys/dev/hptmv/entry.c
  user/adrian/net80211_tx/sys/dev/iicbus/if_ic.c
  user/adrian/net80211_tx/sys/dev/lmc/if_lmc.c
  user/adrian/net80211_tx/sys/dev/lmc/if_lmc.h
  user/adrian/net80211_tx/sys/dev/mpt/mpt_pci.c
  user/adrian/net80211_tx/sys/dev/ppbus/if_plip.c
  user/adrian/net80211_tx/sys/dev/sound/usb/uaudio.c
  user/adrian/net80211_tx/sys/dev/uart/uart_bus_pci.c
  user/adrian/net80211_tx/sys/dev/uart/uart_subr.c
  user/adrian/net80211_tx/sys/dev/usb/controller/usb_controller.c
  user/adrian/net80211_tx/sys/dev/usb/controller/xhci.c
  user/adrian/net80211_tx/sys/dev/usb/net/if_usie.c
  user/adrian/net80211_tx/sys/dev/usb/net/uhso.c
  user/adrian/net80211_tx/sys/dev/usb/usb_process.h
  user/adrian/net80211_tx/sys/geom/geom_dev.c
  user/adrian/net80211_tx/sys/kern/kern_mbuf.c
  user/adrian/net80211_tx/sys/mips/cavium/uart_dev_oct16550.c
  user/adrian/net80211_tx/sys/mips/include/cpufunc.h
  user/adrian/net80211_tx/sys/mips/include/frame.h
  user/adrian/net80211_tx/sys/mips/include/pcb.h
  user/adrian/net80211_tx/sys/mips/include/regnum.h
  user/adrian/net80211_tx/sys/mips/mips/bus_space_generic.c
  user/adrian/net80211_tx/sys/mips/mips/db_interface.c
  user/adrian/net80211_tx/sys/mips/mips/db_trace.c
  user/adrian/net80211_tx/sys/mips/mips/support.S
  user/adrian/net80211_tx/sys/mips/mips/swtch.S
  user/adrian/net80211_tx/sys/mips/mips/trap.c
  user/adrian/net80211_tx/sys/mips/mips/vm_machdep.c
  user/adrian/net80211_tx/sys/modules/uart/Makefile
  user/adrian/net80211_tx/sys/net/ethernet.h
  user/adrian/net80211_tx/sys/net/if.c
  user/adrian/net80211_tx/sys/net/if_arc.h
  user/adrian/net80211_tx/sys/net/if_arcsubr.c
  user/adrian/net80211_tx/sys/net/if_atm.h
  user/adrian/net80211_tx/sys/net/if_atmsubr.c
  user/adrian/net80211_tx/sys/net/if_dead.c
  user/adrian/net80211_tx/sys/net/if_disc.c
  user/adrian/net80211_tx/sys/net/if_ef.c
  user/adrian/net80211_tx/sys/net/if_enc.c
  user/adrian/net80211_tx/sys/net/if_ethersubr.c
  user/adrian/net80211_tx/sys/net/if_faith.c
  user/adrian/net80211_tx/sys/net/if_fddisubr.c
  user/adrian/net80211_tx/sys/net/if_fwsubr.c
  user/adrian/net80211_tx/sys/net/if_gif.c
  user/adrian/net80211_tx/sys/net/if_gif.h
  user/adrian/net80211_tx/sys/net/if_gre.c
  user/adrian/net80211_tx/sys/net/if_iso88025subr.c
  user/adrian/net80211_tx/sys/net/if_lagg.c
  user/adrian/net80211_tx/sys/net/if_lagg.h
  user/adrian/net80211_tx/sys/net/if_loop.c
  user/adrian/net80211_tx/sys/net/if_spppsubr.c
  user/adrian/net80211_tx/sys/net/if_stf.c
  user/adrian/net80211_tx/sys/net/if_tun.c
  user/adrian/net80211_tx/sys/net/if_var.h
  user/adrian/net80211_tx/sys/net/iso88025.h
  user/adrian/net80211_tx/sys/net80211/ieee80211.c
  user/adrian/net80211_tx/sys/net80211/ieee80211_output.c
  user/adrian/net80211_tx/sys/net80211/ieee80211_proto.h
  user/adrian/net80211_tx/sys/net80211/ieee80211_var.h
  user/adrian/net80211_tx/sys/netatalk/aarp.c
  user/adrian/net80211_tx/sys/netatalk/aarp.h
  user/adrian/net80211_tx/sys/netatalk/at_control.c
  user/adrian/net80211_tx/sys/netatalk/at_extern.h
  user/adrian/net80211_tx/sys/netgraph/ng_fec.c
  user/adrian/net80211_tx/sys/netgraph/ng_iface.c
  user/adrian/net80211_tx/sys/netinet/if_atm.c
  user/adrian/net80211_tx/sys/netinet/if_atm.h
  user/adrian/net80211_tx/sys/netinet/if_ether.c
  user/adrian/net80211_tx/sys/netinet/if_ether.h
  user/adrian/net80211_tx/sys/netinet/in.c
  user/adrian/net80211_tx/sys/netinet/ip_carp.c
  user/adrian/net80211_tx/sys/netinet/ip_carp.h
  user/adrian/net80211_tx/sys/netinet/ip_output.c
  user/adrian/net80211_tx/sys/netinet/tcp_input.c
  user/adrian/net80211_tx/sys/netinet6/in6.c
  user/adrian/net80211_tx/sys/netinet6/in6_pcb.c
  user/adrian/net80211_tx/sys/netinet6/in6_var.h
  user/adrian/net80211_tx/sys/netinet6/nd6.c
  user/adrian/net80211_tx/sys/netinet6/nd6.h
  user/adrian/net80211_tx/sys/netpfil/ipfw/ip_fw_log.c
  user/adrian/net80211_tx/sys/netpfil/pf/if_pflog.c
  user/adrian/net80211_tx/sys/netpfil/pf/if_pfsync.c
  user/adrian/net80211_tx/sys/powerpc/aim/mmu_oea.c
  user/adrian/net80211_tx/sys/powerpc/wii/wii_bus.c
  user/adrian/net80211_tx/sys/powerpc/wii/wii_pic.c
  user/adrian/net80211_tx/sys/powerpc/wii/wii_picreg.h
  user/adrian/net80211_tx/sys/sys/ata.h
  user/adrian/net80211_tx/sys/vm/uma_core.c
  user/adrian/net80211_tx/sys/vm/vm_radix.c
  user/adrian/net80211_tx/usr.bin/touch/touch.c
  user/adrian/net80211_tx/usr.sbin/acpi/acpidb/Makefile
  user/adrian/net80211_tx/usr.sbin/acpi/acpidb/acpidb.c
  user/adrian/net80211_tx/usr.sbin/acpi/iasl/Makefile
  user/adrian/net80211_tx/usr.sbin/bhyve/bhyverun.c
  user/adrian/net80211_tx/usr.sbin/bhyve/pci_emul.c
  user/adrian/net80211_tx/usr.sbin/bhyve/pci_emul.h
  user/adrian/net80211_tx/usr.sbin/bhyve/pci_virtio_block.c
  user/adrian/net80211_tx/usr.sbin/bhyve/pci_virtio_net.c
  user/adrian/net80211_tx/usr.sbin/bsdconfig/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/bsdconfig
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/console
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/font
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/keymap
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/repeat
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/saver
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/screenmap
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/ttys
  user/adrian/net80211_tx/usr.sbin/bsdconfig/diskmgmt/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  user/adrian/net80211_tx/usr.sbin/bsdconfig/docsinstall/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/docsinstall/docsinstall
  user/adrian/net80211_tx/usr.sbin/bsdconfig/dot/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/dot/dot
  user/adrian/net80211_tx/usr.sbin/bsdconfig/include/messages.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/disable
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/enable
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/flags
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/mouse
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/port
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/type
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/defaultrouter
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/devices
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/hostname
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/nameservers
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/networking
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/share/device.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/share/media.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/share/resolv.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/password/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/password/include/messages.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/password/password
  user/adrian/net80211_tx/usr.sbin/bsdconfig/password/share/password.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/security/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/security/kern_securelevel
  user/adrian/net80211_tx/usr.sbin/bsdconfig/security/security
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/common.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/device.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/dialog.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/media/common.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/media/ftp.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/media/options.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/mustberoot.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/strings.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/include/messages.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/misc
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcadd
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcconf
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcdelete
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcedit
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcvar
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/share/rcconf.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/share/rcvar.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/startup
  user/adrian/net80211_tx/usr.sbin/bsdconfig/timezone/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/timezone/timezone
  user/adrian/net80211_tx/usr.sbin/bsdconfig/ttys/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/ttys/ttys
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/USAGE
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/groupadd
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/groupdel
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/groupedit
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/groupinput
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/include/messages.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/useradd
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/userdel
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/useredit
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/userinput
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/usermgmt
  user/adrian/net80211_tx/usr.sbin/mergemaster/mergemaster.sh
  user/adrian/net80211_tx/usr.sbin/nandsim/nandsim_cfgparse.c
  user/adrian/net80211_tx/usr.sbin/timed/timed/timed.8
Directory Properties:
  user/adrian/net80211_tx/   (props changed)
  user/adrian/net80211_tx/cddl/   (props changed)
  user/adrian/net80211_tx/cddl/contrib/opensolaris/   (props changed)
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/adrian/net80211_tx/contrib/llvm/   (props changed)
  user/adrian/net80211_tx/crypto/openssh/   (props changed)
  user/adrian/net80211_tx/gnu/usr.bin/gdb/   (props changed)
  user/adrian/net80211_tx/lib/libc/   (props changed)
  user/adrian/net80211_tx/lib/libvmmapi/   (props changed)
  user/adrian/net80211_tx/sbin/   (props changed)
  user/adrian/net80211_tx/sys/   (props changed)
  user/adrian/net80211_tx/sys/amd64/vmm/   (props changed)
  user/adrian/net80211_tx/sys/boot/   (props changed)
  user/adrian/net80211_tx/sys/cddl/contrib/opensolaris/   (props changed)
  user/adrian/net80211_tx/sys/conf/   (props changed)
  user/adrian/net80211_tx/usr.sbin/bhyve/   (props changed)

Modified: user/adrian/net80211_tx/Makefile.inc1
==============================================================================
--- user/adrian/net80211_tx/Makefile.inc1	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/Makefile.inc1	Fri Apr 26 15:48:00 2013	(r249932)
@@ -616,6 +616,7 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
 # Checks to be sure system is ready for installworld/installkernel.
 #
 installcheck:
+installcheck_UGID:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -647,7 +648,6 @@ CHECK_GIDS+=	smmsp
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
-installcheck: installcheck_UGID
 installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
@@ -703,7 +703,7 @@ EXTRA_DISTRIBUTIONS+=	lib32
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: installcheck
+distributeworld installworld: installcheck installcheck_UGID
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \

Modified: user/adrian/net80211_tx/UPDATING
==============================================================================
--- user/adrian/net80211_tx/UPDATING	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/UPDATING	Fri Apr 26 15:48:00 2013	(r249932)
@@ -31,6 +31,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130426:
+	The sysctl which controls TRIM support under ZFS has been renamed
+	from vfs.zfs.trim_disable -> vfs.zfs.trim.enabled and has been
+	enabled by default.
+
+20130425:
+	The mergemaster command now uses the default MAKEOBJDIRPREFIX
+	rather than creating it's own in the temporary directory in
+	order allow access to bootstrapped versions of tools such as
+	install and mtree.  When upgrading from version of FreeBSD where
+	the install command does not support -l, you will need to
+	install a new mergemaster command if mergemaster -p is required.
+	This can be accomplished with the command (cd src/usr.sbin/mergemaster
+	&& make install).
+
 20130404:
 	Legacy ATA stack, disabled and replaced by new CAM-based one since
 	FreeBSD 9.0, completely removed from the sources.  Kernel modules
@@ -1757,7 +1772,7 @@ COMMON ITEMS:
 	step.  It never hurts to do it all the time.  You may need to
 	install a new mergemaster (cd src/usr.sbin/mergemaster && make
 	install) after the buildworld before this step if you last updated
-	from current before 20020224 or from -stable before 20020408.
+	from current before 20130425 or from -stable before 20130430.
 
 	[6] This only deletes old files and directories. Old libraries
 	can be deleted by "make delete-old-libs", but you have to make

Modified: user/adrian/net80211_tx/bin/cat/cat.c
==============================================================================
--- user/adrian/net80211_tx/bin/cat/cat.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/bin/cat/cat.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -68,7 +68,7 @@ static int bflag, eflag, lflag, nflag, s
 static int rval;
 static const char *filename;
 
-static void usage(void);
+static void usage(void) __dead2;
 static void scanfiles(char *argv[], int cooked);
 static void cook_cat(FILE *);
 static void raw_cat(int);
@@ -153,6 +153,7 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
+
 	fprintf(stderr, "usage: cat [-belnstuv] [file ...]\n");
 	exit(1);
 	/* NOTREACHED */

Modified: user/adrian/net80211_tx/bin/dd/dd.c
==============================================================================
--- user/adrian/net80211_tx/bin/dd/dd.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/bin/dd/dd.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -358,7 +358,7 @@ dd_in(void)
 		 * than noerror, notrunc or sync are specified, the block
 		 * is output without buffering as it is read.
 		 */
-		if (ddflags & C_BS) {
+		if ((ddflags & ~(C_NOERROR | C_NOTRUNC | C_SYNC)) == C_BS) {
 			out.dbcnt = in.dbcnt;
 			dd_out(1);
 			in.dbcnt = 0;

Modified: user/adrian/net80211_tx/bin/df/df.c
==============================================================================
--- user/adrian/net80211_tx/bin/df/df.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/bin/df/df.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -296,7 +296,6 @@ main(int argc, char *argv[])
 			prtstat(&mntbuf[i], &maxwidths);
 	if (cflag)
 		prtstat(&totalbuf, &maxwidths);
-	free(mntbuf);
 	return (rv);
 }
 

Modified: user/adrian/net80211_tx/bin/domainname/domainname.1
==============================================================================
--- user/adrian/net80211_tx/bin/domainname/domainname.1	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/bin/domainname/domainname.1	Fri Apr 26 15:48:00 2013	(r249932)
@@ -29,7 +29,7 @@
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd September 18, 1994
+.Dd April 22, 2013
 .Dt DOMAINNAME 1
 .Os
 .Sh NAME
@@ -43,10 +43,11 @@ The
 .Nm
 utility prints the name of the current YP/NIS domain.
 The super-user can
-set the domain name by supplying an argument; this is usually done in the
-network initialization script
-.Pa /etc/rc.network ,
-normally run at boot
+set the domain name by supplying an argument; this is usually done with the
+.Va nisdomainname
+variable in the
+.Pa /etc/rc.conf
+file, normally run at boot
 time.
 .Sh NOTES
 The YP/NIS (formerly ``Yellow Pages'' but renamed for legal reasons)
@@ -54,7 +55,8 @@ domain name does not necessarily have an
 Name System domain name, although they are often set equal for administrative
 convenience.
 .Sh SEE ALSO
-.Xr getdomainname 3
+.Xr getdomainname 3 ,
+.Xr rc.conf 5
 .Sh HISTORY
 The
 .Nm

Modified: user/adrian/net80211_tx/bin/sh/sh.1
==============================================================================
--- user/adrian/net80211_tx/bin/sh/sh.1	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/bin/sh/sh.1	Fri Apr 26 15:48:00 2013	(r249932)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd March 24, 2013
+.Dd April 21, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1340,9 +1340,33 @@ The primary prompt string, which default
 .Dq Li "$ " ,
 unless you are the superuser, in which case it defaults to
 .Dq Li "# " .
+.Va PS1
+may include any of the following formatting sequences,
+which are replaced by the given information:
+.Bl -tag -width indent
+.It Li \eH
+The local hostname.
+.It Li \eh
+The fully-qualified hostname.
+.It Li \eW
+The final component of the current working directory.
+.It Li \ew
+The entire path of the current working directory.
+.It Li \e$
+Superuser status.
+.Dq Li "$ "
+for normal users and
+.Dq Li "# "
+for superusers.
+.It Li \e\e
+A literal backslash.
+.El
 .It Va PS2
 The secondary prompt string, which defaults to
 .Dq Li "> " .
+.Va PS2
+may include any of the formatting sequences from
+.Va PS1 .
 .It Va PS4
 The prefix for the trace output (if
 .Fl x

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -1130,7 +1130,7 @@ alloc:
 #if defined(sun)
 	dtp->dt_prcmode = DT_PROC_STOP_PREINIT;
 #else
-	dtp->dt_prcmode = DT_PROC_STOP_POSTINIT;
+	dtp->dt_prcmode = DT_PROC_STOP_MAIN;
 #endif
 	dtp->dt_linkmode = DT_LINK_KERNEL;
 	dtp->dt_linktype = DT_LTYP_ELF;

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -4207,10 +4207,13 @@ zfs_hold(zfs_handle_t *zhp, const char *
 	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
 		fnvlist_free(ha.nvl);
 		ret = ENOENT;
-		(void) snprintf(errbuf, sizeof (errbuf),
-		    dgettext(TEXT_DOMAIN, "cannot hold snapshot '%s@%s'"),
-		    zhp->zfs_name, snapname);
-		(void) zfs_standard_error(hdl, ret, errbuf);
+		if (!enoent_ok) {
+			(void) snprintf(errbuf, sizeof (errbuf),
+			    dgettext(TEXT_DOMAIN,
+			    "cannot hold snapshot '%s@%s'"),
+			    zhp->zfs_name, snapname);
+			(void) zfs_standard_error(hdl, ret, errbuf);
+		}
 		return (ret);
 	}
 

Modified: user/adrian/net80211_tx/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- user/adrian/net80211_tx/contrib/bsnmp/snmp_mibII/mibII.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/contrib/bsnmp/snmp_mibII/mibII.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -934,6 +934,34 @@ mib_find_ifa(struct in_addr addr)
 }
 
 /*
+ * Process a new ARP entry
+ */
+static void
+process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl,
+    const struct sockaddr_in *sa)
+{
+	struct mibif *ifp;
+	struct mibarp *at;
+
+	/* IP arp table entry */
+	if (sdl->sdl_alen == 0)
+		return;
+	if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL)
+		return;
+	/* have a valid entry */
+	if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL &&
+	    (at = mib_arp_create(ifp, sa->sin_addr,
+	    sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL)
+		return;
+
+	if (rtm->rtm_rmx.rmx_expire == 0)
+		at->flags |= MIBARP_PERM;
+	else
+		at->flags &= ~MIBARP_PERM;
+	at->flags |= MIBARP_FOUND;
+}
+
+/*
  * Handle a routing socket message.
  */
 static void
@@ -1075,6 +1103,23 @@ handle_rtmsg(struct rt_msghdr *rtm)
 #endif
 	  case RTM_GET:
 	  case RTM_ADD:
+		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
+		if (rtm->rtm_flags & RTF_LLINFO) {
+			if (addrs[RTAX_DST] == NULL ||
+			    addrs[RTAX_GATEWAY] == NULL ||
+			    addrs[RTAX_DST]->sa_family != AF_INET ||
+			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
+				break;
+			process_arp(rtm,
+			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
+			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
+		} else {
+			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
+				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
+				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
+		}
+		break;
+
 	  case RTM_DELETE:
 		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
 

Modified: user/adrian/net80211_tx/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
==============================================================================
--- user/adrian/net80211_tx/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp	Fri Apr 26 15:48:00 2013	(r249932)
@@ -1040,10 +1040,10 @@ void InnerLoopVectorizer::scalarizeInstr
   // Create a new entry in the WidenMap and initialize it to Undef or Null.
   VectorParts &VecResults = WidenMap.splat(Instr, UndefVec);
 
-  // For each scalar that we create:
-  for (unsigned Width = 0; Width < VF; ++Width) {
-    // For each vector unroll 'part':
-    for (unsigned Part = 0; Part < UF; ++Part) {
+  // For each vector unroll 'part':
+  for (unsigned Part = 0; Part < UF; ++Part) {
+    // For each scalar that we create:
+    for (unsigned Width = 0; Width < VF; ++Width) {
       Instruction *Cloned = Instr->clone();
       if (!IsVoidRetTy)
         Cloned->setName(Instr->getName() + ".cloned");

Modified: user/adrian/net80211_tx/crypto/openssh/readconf.c
==============================================================================
--- user/adrian/net80211_tx/crypto/openssh/readconf.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/crypto/openssh/readconf.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.195 2013/02/17 23:16:57 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.196 2013/02/22 04:45:08 dtucker Exp $ */
 /* $FreeBSD$ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -403,7 +403,7 @@ parse_token(const char *cp, const char *
 int
 process_config_line(Options *options, const char *host,
 		    char *line, const char *filename, int linenum,
-		    int *activep)
+		    int *activep, int userconfig)
 {
 	char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;
 	char **cpptr, fwdarg[256];
@@ -636,7 +636,7 @@ parse_yesnoask:
 			if (*intptr >= SSH_MAX_IDENTITY_FILES)
 				fatal("%.200s line %d: Too many identity files specified (max %d).",
 				    filename, linenum, SSH_MAX_IDENTITY_FILES);
-			add_identity_file(options, NULL, arg, 1);
+			add_identity_file(options, NULL, arg, userconfig);
 		}
 		break;
 
@@ -1180,7 +1180,7 @@ parse_int:
 
 int
 read_config_file(const char *filename, const char *host, Options *options,
-    int checkperm)
+    int flags)
 {
 	FILE *f;
 	char line[1024];
@@ -1190,7 +1190,7 @@ read_config_file(const char *filename, c
 	if ((f = fopen(filename, "r")) == NULL)
 		return 0;
 
-	if (checkperm) {
+	if (flags & SSHCONF_CHECKPERM) {
 		struct stat sb;
 
 		if (fstat(fileno(f), &sb) == -1)
@@ -1211,7 +1211,8 @@ read_config_file(const char *filename, c
 	while (fgets(line, sizeof(line), f)) {
 		/* Update line number counter. */
 		linenum++;
-		if (process_config_line(options, host, line, filename, linenum, &active) != 0)
+		if (process_config_line(options, host, line, filename, linenum,
+		    &active, flags & SSHCONF_USERCONF) != 0)
 			bad_options++;
 	}
 	fclose(f);
@@ -1394,30 +1395,17 @@ fill_default_options(Options * options)
 		options->protocol = SSH_PROTO_2;
 	if (options->num_identity_files == 0) {
 		if (options->protocol & SSH_PROTO_1) {
-			len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;
-			options->identity_files[options->num_identity_files] =
-			    xmalloc(len);
-			snprintf(options->identity_files[options->num_identity_files++],
-			    len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
+			add_identity_file(options, "~/",
+			    _PATH_SSH_CLIENT_IDENTITY, 0);
 		}
 		if (options->protocol & SSH_PROTO_2) {
-			len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1;
-			options->identity_files[options->num_identity_files] =
-			    xmalloc(len);
-			snprintf(options->identity_files[options->num_identity_files++],
-			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA);
-
-			len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
-			options->identity_files[options->num_identity_files] =
-			    xmalloc(len);
-			snprintf(options->identity_files[options->num_identity_files++],
-			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA);
+			add_identity_file(options, "~/",
+			    _PATH_SSH_CLIENT_ID_RSA, 0);
+			add_identity_file(options, "~/",
+			    _PATH_SSH_CLIENT_ID_DSA, 0);
 #ifdef OPENSSL_HAS_ECC
-			len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1;
-			options->identity_files[options->num_identity_files] =
-			    xmalloc(len);
-			snprintf(options->identity_files[options->num_identity_files++],
-			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA);
+			add_identity_file(options, "~/",
+			    _PATH_SSH_CLIENT_ID_ECDSA, 0);
 #endif
 		}
 	}

Modified: user/adrian/net80211_tx/crypto/openssh/readconf.h
==============================================================================
--- user/adrian/net80211_tx/crypto/openssh/readconf.h	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/crypto/openssh/readconf.h	Fri Apr 26 15:48:00 2013	(r249932)
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.92 2013/02/17 23:16:57 dtucker Exp $ */
+/* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */
 /* $FreeBSD$ */
 
 /*
@@ -163,13 +163,17 @@ typedef struct {
 #define REQUEST_TTY_YES		2
 #define REQUEST_TTY_FORCE	3
 
+#define SSHCONF_CHECKPERM	1  /* check permissions on config file */
+#define SSHCONF_USERCONF	2  /* user provided config file not system */
+
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int	 read_config_file(const char *, const char *, Options *, int);
 int	 parse_forward(Forward *, const char *, int, int);
 
 int
-process_config_line(Options *, const char *, char *, const char *, int, int *);
+process_config_line(Options *, const char *, char *, const char *, int, int *,
+    int);
 
 void	 add_local_forward(Options *, const Forward *);
 void	 add_remote_forward(Options *, const Forward *);

Modified: user/adrian/net80211_tx/crypto/openssh/ssh.c
==============================================================================
--- user/adrian/net80211_tx/crypto/openssh/ssh.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/crypto/openssh/ssh.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.371 2013/02/17 23:16:57 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.373 2013/02/22 22:09:01 djm Exp $ */
 /* $FreeBSD$ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -598,7 +598,8 @@ main(int ac, char **av)
 			dummy = 1;
 			line = xstrdup(optarg);
 			if (process_config_line(&options, host ? host : "",
-			    line, "command-line", 0, &dummy) != 0)
+			    line, "command-line", 0, &dummy, SSHCONF_USERCONF)
+			    != 0)
 				exit(255);
 			xfree(line);
 			break;
@@ -692,14 +693,15 @@ main(int ac, char **av)
 	 * file if the user specifies a config file on the command line.
 	 */
 	if (config != NULL) {
-		if (!read_config_file(config, host, &options, 0))
+		if (!read_config_file(config, host, &options, SSHCONF_USERCONF))
 			fatal("Can't open user config file %.100s: "
 			    "%.100s", config, strerror(errno));
 	} else {
 		r = snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir,
 		    _PATH_SSH_USER_CONFFILE);
 		if (r > 0 && (size_t)r < sizeof(buf))
-			(void)read_config_file(buf, host, &options, 1);
+			(void)read_config_file(buf, host, &options,
+			     SSHCONF_CHECKPERM|SSHCONF_USERCONF);
 
 		/* Read systemwide configuration file after user config. */
 		(void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
@@ -1611,7 +1613,8 @@ load_public_identity_files(void)
 		fatal("load_public_identity_files: gethostname: %s",
 		    strerror(errno));
 	for (i = 0; i < options.num_identity_files; i++) {
-		if (n_ids >= SSH_MAX_IDENTITY_FILES) {
+		if (n_ids >= SSH_MAX_IDENTITY_FILES ||
+		    strcasecmp(options.identity_files[i], "none") == 0) {
 			xfree(options.identity_files[i]);
 			continue;
 		}

Modified: user/adrian/net80211_tx/gnu/usr.bin/gdb/kgdb/trgt_mips.c
==============================================================================
--- user/adrian/net80211_tx/gnu/usr.bin/gdb/kgdb/trgt_mips.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/gnu/usr.bin/gdb/kgdb/trgt_mips.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -115,6 +115,16 @@ static int kgdb_trgt_frame_offset[] = {
 	offsetof(struct trapframe, a1),
 	offsetof(struct trapframe, a2),
 	offsetof(struct trapframe, a3),
+#if defined(__mips_n32) || defined(__mips_n64)
+	offsetof(struct trapframe, a4),
+	offsetof(struct trapframe, a5),
+	offsetof(struct trapframe, a6),
+	offsetof(struct trapframe, a7),
+	offsetof(struct trapframe, t0),
+	offsetof(struct trapframe, t1),
+	offsetof(struct trapframe, t2),
+	offsetof(struct trapframe, t3),
+#else
 	offsetof(struct trapframe, t0),
 	offsetof(struct trapframe, t1),
 	offsetof(struct trapframe, t2),
@@ -123,6 +133,7 @@ static int kgdb_trgt_frame_offset[] = {
 	offsetof(struct trapframe, t5),
 	offsetof(struct trapframe, t6),
 	offsetof(struct trapframe, t7),
+#endif
 	offsetof(struct trapframe, s0),
 	offsetof(struct trapframe, s1),
 	offsetof(struct trapframe, s2),

Modified: user/adrian/net80211_tx/include/stringlist.h
==============================================================================
--- user/adrian/net80211_tx/include/stringlist.h	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/include/stringlist.h	Fri Apr 26 15:48:00 2013	(r249932)
@@ -51,7 +51,7 @@ __BEGIN_DECLS
 StringList *sl_init(void);
 int	 sl_add(StringList *, char *);
 void	 sl_free(StringList *, int);
-char	*sl_find(StringList *, char *);
+char	*sl_find(StringList *, const char *);
 __END_DECLS
 
 #endif /* _STRINGLIST_H */

Modified: user/adrian/net80211_tx/lib/libc/gen/stringlist.3
==============================================================================
--- user/adrian/net80211_tx/lib/libc/gen/stringlist.3	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/gen/stringlist.3	Fri Apr 26 15:48:00 2013	(r249932)
@@ -49,7 +49,7 @@
 .Ft void
 .Fn sl_free "StringList *sl" "int freeall"
 .Ft char *
-.Fn sl_find "StringList *sl" "char *item"
+.Fn sl_find "StringList *sl" "const char *item"
 .Sh DESCRIPTION
 The
 .Nm

Modified: user/adrian/net80211_tx/lib/libc/gen/stringlist.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/gen/stringlist.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/gen/stringlist.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
  * sl_init(): Initialize a string list
  */
 StringList *
-sl_init()
+sl_init(void)
 {
 	StringList *sl;
 
@@ -67,9 +67,7 @@ sl_init()
  * sl_add(): Add an item to the string list
  */
 int
-sl_add(sl, name)
-	StringList *sl;
-	char *name;
+sl_add(StringList *sl, char *name)
 {
 	if (sl->sl_cur == sl->sl_max - 1) {
 		sl->sl_max += _SL_CHUNKSIZE;
@@ -86,9 +84,7 @@ sl_add(sl, name)
  * sl_free(): Free a stringlist
  */
 void
-sl_free(sl, all)
-	StringList *sl;
-	int all;
+sl_free(StringList *sl, int all)
 {
 	size_t i;
 
@@ -108,9 +104,7 @@ sl_free(sl, all)
  * sl_find(): Find a name in the string list
  */
 char *
-sl_find(sl, name)
-	StringList *sl;
-	char *name;
+sl_find(StringList *sl, const char *name)
 {
 	size_t i;
 

Modified: user/adrian/net80211_tx/lib/libc/stdio/asprintf.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/asprintf.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/asprintf.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -18,7 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/clrerr.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/clrerr.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/clrerr.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -45,8 +45,7 @@ __FBSDID("$FreeBSD$");
 #undef clearerr_unlocked
 
 void
-clearerr(fp)
-	FILE *fp;
+clearerr(FILE *fp)
 {
 	FLOCKFILE(fp);
 	__sclearerr(fp);

Modified: user/adrian/net80211_tx/lib/libc/stdio/fclose.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fclose.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fclose.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/fdopen.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fdopen.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fdopen.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -47,9 +47,7 @@ __FBSDID("$FreeBSD$");
 #include "local.h"
 
 FILE *
-fdopen(fd, mode)
-	int fd;
-	const char *mode;
+fdopen(int fd, const char *mode)
 {
 	FILE *fp;
 	int flags, oflags, fdflags, tmp;

Modified: user/adrian/net80211_tx/lib/libc/stdio/feof.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/feof.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/feof.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/ferror.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/ferror.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/ferror.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/fflush.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fflush.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fflush.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/fgetc.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fgetc.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fgetc.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -43,8 +43,7 @@ __FBSDID("$FreeBSD$");
 #include "local.h"
 
 int
-fgetc(fp)
-	FILE *fp;
+fgetc(FILE *fp)
 {
 	int retval;
 	FLOCKFILE(fp);

Modified: user/adrian/net80211_tx/lib/libc/stdio/fgetln.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fgetln.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fgetln.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/fgetpos.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fgetpos.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fgetpos.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/fgets.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fgets.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fgets.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -49,10 +49,7 @@ __FBSDID("$FreeBSD$");
  * Return first argument, or NULL if no characters were read.
  */
 char *
-fgets(buf, n, fp)
-	char *buf;
-	int n;
-	FILE *fp;
+fgets(char * __restrict buf, int n, FILE * __restrict fp)
 {
 	size_t len;
 	char *s;

Modified: user/adrian/net80211_tx/lib/libc/stdio/fileno.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fileno.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fileno.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/findfp.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/findfp.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/findfp.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -91,8 +91,7 @@ spinlock_t __stdio_thread_lock = _SPINLO
 #endif
 
 static struct glue *
-moreglue(n)
-	int n;
+moreglue(int n)
 {
 	struct glue *g;
 	static FILE empty = { ._fl_mutex = PTHREAD_MUTEX_INITIALIZER };

Modified: user/adrian/net80211_tx/lib/libc/stdio/flags.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/flags.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/flags.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$");
  * Return 0 on error.
  */
 int
-__sflags(mode, optr)
-	const char *mode;
-	int *optr;
+__sflags(const char *mode, int *optr)
 {
 	int ret, m, o;
 

Modified: user/adrian/net80211_tx/lib/libc/stdio/fopen.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fopen.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fopen.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$");
 #include "local.h"
 
 FILE *
-fopen(file, mode)
-	const char * __restrict file;
-	const char * __restrict mode;
+fopen(const char * __restrict file, const char * __restrict mode)
 {
 	FILE *fp;
 	int f;

Modified: user/adrian/net80211_tx/lib/libc/stdio/fprintf.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fprintf.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fprintf.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -18,7 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/fpurge.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fpurge.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fpurge.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -49,8 +49,7 @@ __FBSDID("$FreeBSD$");
  * given FILE's buffer empty.
  */
 int
-fpurge(fp)
-	FILE *fp;
+fpurge(FILE *fp)
 {
 	int retval;
 	FLOCKFILE(fp);

Modified: user/adrian/net80211_tx/lib/libc/stdio/fputc.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fputc.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fputc.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -43,9 +43,7 @@ __FBSDID("$FreeBSD$");
 #include "libc_private.h"
 
 int
-fputc(c, fp)
-	int c;
-	FILE *fp;
+fputc(int c, FILE *fp)
 {
 	int retval;
 	FLOCKFILE(fp);

Modified: user/adrian/net80211_tx/lib/libc/stdio/fputs.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fputs.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fputs.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -48,9 +48,7 @@ __FBSDID("$FreeBSD$");
  * Write the given string to the given file.
  */
 int
-fputs(s, fp)
-	const char * __restrict s;
-	FILE * __restrict fp;
+fputs(const char * __restrict s, FILE * __restrict fp)
 {
 	int retval;
 	struct __suio uio;

Modified: user/adrian/net80211_tx/lib/libc/stdio/fread.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fread.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fread.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/freopen.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/freopen.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/freopen.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -55,10 +55,8 @@ __FBSDID("$FreeBSD$");
  * all possible, no matter what.
  */
 FILE *
-freopen(file, mode, fp)
-	const char * __restrict file;
-	const char * __restrict mode;
-	FILE *fp;
+freopen(const char * __restrict file, const char * __restrict mode,
+    FILE * __restrict fp)
 {
 	int f;
 	int dflags, flags, isopen, oflags, sverrno, wantfd;

Modified: user/adrian/net80211_tx/lib/libc/stdio/fscanf.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fscanf.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fscanf.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -18,7 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: user/adrian/net80211_tx/lib/libc/stdio/fseek.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fseek.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fseek.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -51,10 +51,7 @@ __FBSDID("$FreeBSD$");
 #define	POS_ERR	(-(fpos_t)1)
 
 int
-fseek(fp, offset, whence)
-	FILE *fp;
-	long offset;
-	int whence;
+fseek(FILE *fp, long offset, int whence)
 {
 	int ret;
 	int serrno = errno;
@@ -72,10 +69,7 @@ fseek(fp, offset, whence)
 }
 
 int
-fseeko(fp, offset, whence)
-	FILE *fp;
-	off_t offset;
-	int whence;
+fseeko(FILE *fp, off_t offset, int whence)
 {
 	int ret;
 	int serrno = errno;
@@ -97,11 +91,7 @@ fseeko(fp, offset, whence)
  * `Whence' must be one of the three SEEK_* macros.
  */
 int
-_fseeko(fp, offset, whence, ltest)
-	FILE *fp;
-	off_t offset;
-	int whence;
-	int ltest;
+_fseeko(FILE *fp, off_t offset, int whence, int ltest)
 {
 	fpos_t (*seekfn)(void *, fpos_t, int);
 	fpos_t target, curoff, ret;

Modified: user/adrian/net80211_tx/lib/libc/stdio/fsetpos.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/fsetpos.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/fsetpos.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -43,9 +43,7 @@ __FBSDID("$FreeBSD$");
  * fsetpos: like fseek.
  */
 int
-fsetpos(iop, pos)
-	FILE *iop;
-	const fpos_t *pos;
+fsetpos(FILE *iop, const fpos_t *pos)
 {
 	return (fseeko(iop, (off_t)*pos, SEEK_SET));
 }

Modified: user/adrian/net80211_tx/lib/libc/stdio/ftell.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/stdio/ftell.c	Fri Apr 26 15:46:09 2013	(r249931)
+++ user/adrian/net80211_tx/lib/libc/stdio/ftell.c	Fri Apr 26 15:48:00 2013	(r249932)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -49,8 +49,7 @@ __FBSDID("$FreeBSD$");
  * standard ftell function.
  */
 long
-ftell(fp)
-	FILE *fp;
+ftell(FILE *fp)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***