diff --git a/[refs] b/[refs]
index d651957df3e8..3fd2c58020d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1e80fafc9f0742a1776a0490258cb64912411b0
+refs/heads/master: c214909b36efec632432acdcbfacdd46a6e11370
diff --git a/trunk/tools/perf/util/thread.c b/trunk/tools/perf/util/thread.c
index 1f7ecd47f499..9a448b47400c 100644
--- a/trunk/tools/perf/util/thread.c
+++ b/trunk/tools/perf/util/thread.c
@@ -7,6 +7,15 @@
 #include "util.h"
 #include "debug.h"
 
+/* Skip "." and ".." directories */
+static int filter(const struct dirent *dir)
+{
+	if (dir->d_name[0] == '.')
+		return 0;
+	else
+		return 1;
+}
+
 int find_all_tid(int pid, pid_t ** all_tid)
 {
 	char name[256];
@@ -16,7 +25,7 @@ int find_all_tid(int pid, pid_t ** all_tid)
 	int i;
 
 	sprintf(name, "/proc/%d/task", pid);
-	items = scandir(name, &namelist, NULL, NULL);
+	items = scandir(name, &namelist, filter, NULL);
 	if (items <= 0)
                 return -ENOENT;
 	*all_tid = malloc(sizeof(pid_t) * items);