Merge tag 'v3.4-rc2' into perf/core

Merge Linux 3.4-rc2: we were on v3.3, update the base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/tools/testing/selftests/breakpoints/Makefile b/tools/testing/selftests/breakpoints/Makefile
index f362722cdce7..931278035f5c 100644
--- a/tools/testing/selftests/breakpoints/Makefile
+++ b/tools/testing/selftests/breakpoints/Makefile
@@ -11,10 +11,13 @@ endif
 
 all:
 ifeq ($(ARCH),x86)
-        gcc breakpoint_test.c -o run_test
+        gcc breakpoint_test.c -o breakpoint_test
 else
         echo "Not an x86 target, can't build breakpoints selftests"
 endif
 
+run_tests:
+        ./breakpoint_test
+
 clean:
-        rm -fr run_test
+        rm -fr breakpoint_test