diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:52:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:52:30 +0200 |
| commit | c493756e2a8a78bcaae30668317890dcfe86e7c3 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /drivers/oprofile/cpu_buffer.c | |
| parent | Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into oprofile (diff) | |
| parent | MAINTAINERS: remove colon from headings (diff) | |
| download | linux-dev-c493756e2a8a78bcaae30668317890dcfe86e7c3.tar.xz linux-dev-c493756e2a8a78bcaae30668317890dcfe86e7c3.zip | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
0 files changed, 0 insertions, 0 deletions