diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:51:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:51:10 -0700 |
| commit | 57eee9ae7bbcfb692dc96c739a5184adb6349733 (patch) | |
| tree | dd268927f30b91e8cbf95ec58e6004673b71fe40 /kernel/trace/blktrace.c | |
| parent | 8f40642ad315c553bab4ae800766ade07e574a77 (diff) | |
| parent | 7e4e0bd50e80df2fe5501f48f872448376cdd997 (diff) | |
Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
oprofile: introduce module_param oprofile.cpu_type
oprofile: add support for Core i7 and Atom
oprofile: remove undocumented oprofile.p4force option
oprofile: re-add force_arch_perfmon option
Diffstat (limited to 'kernel/trace/blktrace.c')
0 files changed, 0 insertions, 0 deletions