diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-24 12:01:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-24 12:01:02 +0200 |
| commit | 734e9a26d612f64e1c9cfd92256969b773954ae2 (patch) | |
| tree | d6fd23e9cf7ea37d36060e877e856001d83e6c6c /drivers/acpi/battery.c | |
| parent | d57c5d51a30152f3175d2344cb6395f08bf8ee0c (diff) | |
| parent | f63fe79fa0b1362e8ea1c1e4996cf70d14917b02 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Improve warning message when libunwind devel packages not present, from Jiri Olsa
* Remove perf_event_attr needless version inflation, from Jiri Olsa
* Introduce libtraceevent strerror like error reporting facility, from Namhyung Kim
* Add pmu mappings to perf.data header and use event names from cmd line, from Robert Richter
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions