diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-12 10:08:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-12 10:08:38 +0200 |
| commit | 61d67d568445413137995e1bea2746783e3a81e9 (patch) | |
| tree | 852cf8ac74580b3b04641d7b48f39fe6fb34e86f /drivers/watchdog/nuc900_wdt.c | |
| parent | 028c63b56795206464263fa3bc47094704c2a840 (diff) | |
| parent | c8ad7063626406181a7ebab10cb31b4f741b13d4 (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:
User visible changes:
- Beautify the perf_event_open() syscall in 'perf trace'. (Arnaldo Carvalho de Melo)
- Error out unsupported group leader immediately in 'perf stat'. (Kan Liang)
- Amend some 'perf record' option summaries (period, etc). (Peter Zijlstra)
- Avoid possible race condition in copyfile() in 'perf buildid-cache'. (Milos Vyletel)
Infrastructure changes:
- Display 0x for hex values when printing the attribute. (Adrian Hunter)
- Update MANIFEST per files removed from kernel. (David Ahern)
Build fixes:
- Fix PRIu64 printf related failure on 32-bit arch. (He Kuang)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/watchdog/nuc900_wdt.c')
0 files changed, 0 insertions, 0 deletions