diff --git a/[refs] b/[refs]
index 85917cfd0d75..fefa3282cfc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fbd065f5a2b299172502f09fc3fbde02b48f591
+refs/heads/master: f18568aae5612ab37f20e5f383d6154ea69c9dfc
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index b5276c7e9be2..91ad5cc95d85 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -138,7 +138,7 @@ INSTALL = install
 # explicitly what architecture to check for. Fix this up for yours..
 SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 
--include feature-tests.mak
+-include config/feature-tests.mak
 
 ifeq ($(call try-cc,$(SOURCE_HELLO),-Werror -fstack-protector-all),y)
 	CFLAGS := $(CFLAGS) -fstack-protector-all
diff --git a/trunk/tools/perf/feature-tests.mak b/trunk/tools/perf/config/feature-tests.mak
similarity index 100%
rename from trunk/tools/perf/feature-tests.mak
rename to trunk/tools/perf/config/feature-tests.mak