diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 12:15:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 12:15:30 +0100 |
| commit | 057685cf57066bc8aaed68de1b1970e12f0075d2 (patch) | |
| tree | e7fea68e7080d6366b45775028bfbdf6237ecda5 /arch/x86/kvm/vmx.c | |
| parent | Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core (diff) | |
| parent | SLUB: Introduce and use SLUB_MAX_SIZE and SLUB_PAGE_SHIFT constants (diff) | |
| download | linux-057685cf57066bc8aaed68de1b1970e12f0075d2.tar.xz linux-057685cf57066bc8aaed68de1b1970e12f0075d2.zip | |
Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'arch/x86/kvm/vmx.c')
0 files changed, 0 insertions, 0 deletions