diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
| commit | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (patch) | |
| tree | d4c5eba8cd2abefd7c9f16d089393f0f5999cf63 /Documentation/networking/smctr.txt | |
| parent | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (diff) | |
| parent | 9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf (diff) | |
Merge branch 'x86/mpparse' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_64.c
arch/x86/mm/init_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/networking/smctr.txt')
0 files changed, 0 insertions, 0 deletions