Merge branch 'master' into 20130529-dtrace-sdt-arg-test
Merge branch 'markj-kernel-config' into 20130529-dtrace-sdt-arg-test
Merge branch 'markj-kernel-config' into 20130421-ip-provider

Conflicts:
	sys/sys/sdt.h
Revert the change to fetch arguments off the stack; I have the proper
fix on another branch.
Merge branch '20130529-dtrace-sdt-arg-test' into 20130421-ip-provider

Conflicts:
	sys/cddl/dev/dtrace/amd64/dtrace_isa.c
Merge branch '20130421-ip-provider' into 20130427-udp-provider
Merge branch '20130427-udp-provider' into 20130428-tcp-provider
Merge branch '20130421-ip-provider' into markj-develop
Merge branch '20130427-udp-provider' into markj-develop
Merge branch '20130428-tcp-provider' into markj-develop
Fix the bug without using code that invokes undefined behaviour.
Merge branch '20130529-dtrace-sdt-arg-test' into markj-develop