Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

Conflicts:

	ChangeLog
	testsuite/ChangeLog

1 files changed, 0 insertions, 15 deletions

diff --git a/testsuite/systemtap.examples/small_demos/keyhack.stp b/testsuite/systemtap.examples/small_demos/keyhack.stp
deleted file mode 100755
index 3137baad..00000000
--- a/testsuite/systemtap.examples/small_demos/keyhack.stp
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env stap
-
-# This is not useful, but it demonstrates that
-# Systemtap can modify variables in a running kernel.
-
-# Usage: ./keyhack.stp -g
-
-probe kernel.function("kbd_event") {
-	# Changes 'm' to 'b' .
-	if ($event_code == 50) $event_code = 48
-}
-
-probe end {
-	printf("\nDONE\n")
-}