diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2012-01-31 13:02:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-31 13:02:37 +0100 |
| commit | bb1693f89ae7f0b30c90d9b26a4f827faed1144a (patch) | |
| tree | e02fc59d76d79493bffa190e492775baa134bff6 /net/lapb/lapb_timer.c | |
| parent | jump_label: Add some documentation (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
| download | linux-dev-bb1693f89ae7f0b30c90d9b26a4f827faed1144a.tar.xz linux-dev-bb1693f89ae7f0b30c90d9b26a4f827faed1144a.zip | |
Merge branch 'perf/urgent' into perf/core
We cherry-picked 3 commits into perf/urgent, merge them back to allow
conflict-free work on those files.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions