diff options
author | Felipe Balbi <balbi@ti.com> | 2015-01-19 09:57:20 -0600 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-01-19 09:57:20 -0600 |
commit | d1fc4440d761af47fd0c32661725011bf66ebb51 (patch) | |
tree | d2fdfe049eac9b45a9418bd1be103297b1c0c55e /tools/perf/util/python-ext-sources | |
parent | fe198e34a44ce7f27e39c303d62a754129938194 (diff) | |
parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) |
Merge tag 'v3.19-rc5' into next
Linux 3.19-rc5
Conflicts:
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/bdc/bdc_ep.c
Diffstat (limited to 'tools/perf/util/python-ext-sources')
-rw-r--r-- | tools/perf/util/python-ext-sources | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources index 16a475a7d492..6c6a6953fa93 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources @@ -10,7 +10,7 @@ util/ctype.c util/evlist.c util/evsel.c util/cpumap.c -util/hweight.c +../../lib/hweight.c util/thread_map.c util/util.c util/xyarray.c |