aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2012-09-16 16:51:27 -0700
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2012-09-16 16:51:27 -0700
commit8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e (patch)
tree88cd7852d59ebae54fcc2f57019ea13284042962 /tools
parentdriver-core: Shut up dev_dbg_reatelimited() without DEBUG (diff)
parentLinux 3.6-rc6 (diff)
downloadlinux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.tar.gz
linux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.tar.bz2
linux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.zip
Merge 3.6-rc7 into driver-core-next
This pulls in the fixes in that branch that are needed here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/python-ext-sources2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
index 2884e67ee625..213362850abd 100644
--- a/tools/perf/util/python-ext-sources
+++ b/tools/perf/util/python-ext-sources
@@ -10,10 +10,12 @@ util/ctype.c
util/evlist.c
util/evsel.c
util/cpumap.c
+util/hweight.c
util/thread_map.c
util/util.c
util/xyarray.c
util/cgroup.c
util/debugfs.c
+util/rblist.c
util/strlist.c
../../lib/rbtree.c