diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:48:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:48:39 +0200 |
| commit | 1102c660dd35725a11c7ca9365c237f2f42f6b30 (patch) | |
| tree | cd32d3053b30050182218e0d36b4aed7459c48de /tools/perf/builtin-annotate.c | |
| parent | watchdog: Fix non-standard prototype of get_softlockup_thresh() (diff) | |
| parent | tmpfs: fix XATTR N overriding POSIX_ACL Y (diff) | |
| download | linux-dev-1102c660dd35725a11c7ca9365c237f2f42f6b30.tar.xz linux-dev-1102c660dd35725a11c7ca9365c237f2f42f6b30.zip | |
Merge branch 'linus' into perf/urgent
Merge reason: Linus applied an overlapping commit:
5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypes
So merge it in to make sure we can iterate the file without conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions