diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:58:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:58:46 +0200 |
| commit | 51887c8230d57c4d9cc68e3784c52c8f0a708655 (patch) | |
| tree | 70509225468cddacb24eccdc78c7d8fc9e0197c5 /kernel/watchdog.c | |
| parent | Merge branch 'perf/urgent' into perf/core (diff) | |
| parent | perf stat: Add -o and --append options (diff) | |
| download | linux-dev-51887c8230d57c4d9cc68e3784c52c8f0a708655.tar.xz linux-dev-51887c8230d57c4d9cc68e3784c52c8f0a708655.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Conflicts:
tools/perf/builtin-stat.c
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions