Merge branch 'markj-kernel-config' into 20130427-udp-provider
Merge branch '20130324-clean-ports-modules' into 20130427-udp-provider
Introduce the udp provider and add send/receive probes for IPv4.
Set the IP version in the header so that the mbuf -> ipinfo_t translator
knows what's up.
Fix an SDT argument description.
Merge branch '20130421-ip-provider' into 20130427-udp-provider to pick
up the translator definitions in ip.d

Conflicts:
	sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c
Merge branch '20130427-udp-provider' into markj-develop