diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-06-16 13:26:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-16 13:26:23 +0200 |
| commit | af07ce3e77d3b24ab1d71fcc5833d41800f23b2b (patch) | |
| tree | f464a6df26e0b62ba23c22de954cd58fb9a59aaa /include/linux/kmod.h | |
| parent | Merge commit 'v3.0-rc3' into perf/core (diff) | |
| parent | ftrace/s390: mcount offset calculation (diff) | |
| download | linux-dev-af07ce3e77d3b24ab1d71fcc5833d41800f23b2b.tar.xz linux-dev-af07ce3e77d3b24ab1d71fcc5833d41800f23b2b.zip | |
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Conflicts:
Makefile
Diffstat (limited to 'include/linux/kmod.h')
0 files changed, 0 insertions, 0 deletions