Merge branch 'markj-kernel-config' into 20130808-sdt-xlate-args
Revert "Fix a lock recursion that can happen when a fasttrap victim process forks."

This reverts commit 9817d19f1eaee5e55974184c0a863eb2aea546f3.
Merge branch 'master' into markj-develop
Merge branch '20130624-sdt-module-info' into markj-develop
Merge branch '20130808-sdt-xlate-args' into markj-develop
Merge branch '20130421-ip-provider' into markj-develop

Conflicts:
	sys/netinet/ip_input.c
Merge branch '20130427-udp-provider' into markj-develop