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 /arch/sparc64/kernel/mdesc.c | |
| parent | 0d15504f16f68725e4635aa85411015d1c573b0a (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/sparc64/kernel/mdesc.c')
0 files changed, 0 insertions, 0 deletions