A transition period of more than two years is more than enough:
Remove the compatibility code added in 2011-02-10.

This change is not intended for MFC

Reviewed by:	imp
explicitly mark some variables as const
Add missing braces.

Submitted by:	Sascha Wildner <saw online de>
Obtained from:	DragonFly
MFC after:	1 week
whitespace changes:
remove $Id$ lines, and add blank lines around some #if / #elif /#endif
Only cleanup CMI-related state on detach if the system supports CMI.

PR:		kern/163268
MFC after:	1 week
whitespace - document alternative locking under linux
Fix a bug that allows NFS clients to issue READDIR on files.

PR:		kern/178016
Security:	CVE-2013-3266
Security:	FreeBSD-SA-13:05.nfsserver
Add a -Z option which zeroes unused blocks.  It can be combined with -E,
in which case unused blocks are first zeroed and then erased.

Reviewed by:	mckusick
MFC after:	3 weeks
Style nit.
Properly terminate the result string for intermediate results, to
allow the final strcpy() to start at the intended place.

Reported and tested by:	pgj
Pointy hat to:	kib
MFC after:	3 days
Add a new driver to support the Intel Non-Transparent Bridge(NTB).

The NTB allows you to connect two systems with this device using a PCI-e
link. The driver is made of two modules:
 - ntb_hw which is a basic hardware abstraction layer for the device.
 - if_ntb which implements the ntb network device and the communication
   protocol.

The driver is limited at the moment to CPU memcpy instead of using DMA, and
only Back-to-Back mode is supported. Also the network device isn't full
featured yet. These changes will be coming soon. The DMA change will also
bring in the ioat driver from the project branch it is on now.

This is an initial port of the GPL/BSD Linux driver contributed by Jon Mason
from Intel. Any bugs are my contributions.

Sponsored by: Intel
Reviewed by: jimharris, joel (man page only)
Approved by: jimharris (mentor)
xenstore/xenstore.c:
	Prevent access to invalid memory region when listing an empty
	directory in the XenStore.

Reported by:	Bei Guan
MFC after:	1 week
Sync from git - ah_config is in 'ath_hal', not 'ath_hal_private' on
FreeBSD.
Use a separate mutex for the receive path instead of overloading the softc
mutex for this purpose.

Reviewed by:	grehan
Reset some more softc state when the guest resets the virtio network device.

Obtained from:	NetApp
Oh wow.. disassociate/disown any connection with cvs.
Pass a format string to kproc_create() [1] and thus fix the build with
-DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security.
This also allows to eliminates a superfluous malloc/snprintf/free on
intermediate buffer.

PR:		kern/175546
MFC after:	1 week
cxgbe(4): Some updates to shared code.

Obtained from:	Chelsio
MFC after:	1 week
- Provide accurate ifmedia information so that 40G ports/transceivers are
  displayed properly in ifconfig, etc.

- Use the same number of tx and rx queues for a 40G port as for a 10G port.

MFC after:	1 week
Attach to the T580 (2 x 40G) card.

MFC after:	1 week.