Don't comment out commented-out code.
Merge branch 'master' into markj-kernel-config
Merge branch 'markj-kernel-config' into 20130624-sdt-module-info
General cleanup, and get rid of most of kern_sdt.c.
Merge branch '20130624-sdt-module-info' into markj-develop