Merge branch 'master' into markj-kernel-config
Merge branch 'markj-kernel-config' into 20130624-sdt-module-info

Conflicts:
	sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
	sys/cddl/dev/dtrace/dtrace_load.c
Add copyright.
Merge branch '20130624-sdt-module-info' into markj-develop

Conflicts:
	sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
Fix an incorrect merge.
Merge branch '20130624-sdt-module-info' into markj-develop