tree 3f56a1a1e1e561e25317c7c3ede127d509961ffa
parent 068f1d3f45546f4bb24e9be67231db1be296f0c8
parent 8578b891ec38c39abd5d6376afd05fce78e2628c
author Ingo Molnar <mingo@kernel.org> 1406724666 +0200
committer Ingo Molnar <mingo@kernel.org> 1406724666 +0200
mergetag object 8578b891ec38c39abd5d6376afd05fce78e2628c
 type commit
 tag perf-core-for-mingo
 tagger Jiri Olsa <jolsa@kernel.org> 1406558436 +0200
 
 perf/core improvements and fixes:
 
 . Fix perf usage string leftover (Jiri Olsa)
 
 . Revert "perf tools: Fix jump label always changing during tracing" (Jiri Olsa)
 
 Signed-off-by: Jiri Olsa <jolsa@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT1mDqAAoJEPZqUSBWB3s96nEQAMGQ45usHOhiPjUE/wtfDXi5
 pzcB7+MZrpRvT6B4MfsWiDV/rp82JwxtqvMThO2ew34eMvu6iTbImlu9O0SiHUY+
 TdDmDkyBzrB8+IlfzHaImxdOHhjHbr4R4WeZOG7OIin69QMrD8GFkSQ5BW8r7k/O
 kVGai2sAAL06gQc0iWyN8q7haavz6t1iSiOfHSS0l8Pn/TiIdAA6EX8fWVGcsJFU
 k0wB0pYI6dgZsnL7YfTJPhERVLc6fjkAN5sbfuFxNmnDq5uXDbA0aEcvfdlrisMv
 2XlV28R8VBaq1enJdqMdwQ5rkMfoZOANUQ7HcIPoFV5WunXcIX0zOh0mDnhWLGqY
 9IDO8XZrpaN0/4CvIt8lB4i9OrBljkhnhWZgsgk0ZY2xqy0svMsnL1IZQ3wvp5dr
 gYLNLEYgc1pH8DGNObsWJ6S5fCgy726zkiRJF2x9aMOZeCpLxavrRwZyQuDQWk1C
 VSU//b6aYyYyho/UEyRZXwfRWXp8Pzgzz9hWzUUJQPHyJOyfZbAyxLAdgJcEno6z
 BC0cHrbqOy4COzMfPmj9L4LP++vf/M03LO88ywVtDwFfp8ww3Tent3AhWVSbfLWq
 v5AmnPlktI/Tv8W90JT66JdwwGFtwPmjVxoiI01SjsMzxOoOdDsdA7WZtonoq7xL
 FgX3/yNioiN0RIweHMB9
 =BMXE
 -----END PGP SIGNATURE-----

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

 * Fix perf usage string leftover (Jiri Olsa)

 * Revert "perf tools: Fix jump label always changing during tracing" (Jiri Olsa)

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