diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:50:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:50:59 -0700 |
commit | 8bd93ca7b03f38a7bc1a4ed9e93e8c006e753d5b (patch) | |
tree | 308bb026df1360d8708d53ebd4421719b470b2fb /Documentation/00-INDEX | |
parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
parent | 87c6f40128f92621698f97a62d2ead5184d1dd97 (diff) |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, gart: fix gart detection for Fam11h CPUs
x86: 64 bit print out absent pages num too
x86, kdump: fix invalid access on i386 sparsemem
x86: fix APIC_DEBUG with inquire_remote_apic
x86: AMD microcode patch loader author update
x86: microcode patch loader author update
mailmap: add Peter Oruba
x86, bts: improve help text for BTS config
doc/x86: fix doc subdirs
Diffstat (limited to 'Documentation/00-INDEX')
-rw-r--r-- | Documentation/00-INDEX | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 7286ad090db..edef85ce119 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -172,7 +172,7 @@ i2c/ - directory with info about the I2C bus/protocol (2 wire, kHz speed). i2o/ - directory with info about the Linux I2O subsystem. -i386/ +x86/i386/ - directory with info about Linux on Intel 32 bit architecture. ia64/ - directory with info about Linux on Intel 64 bit architecture. @@ -382,7 +382,7 @@ w1/ - directory with documents regarding the 1-wire (w1) subsystem. watchdog/ - how to auto-reboot Linux if it has "fallen and can't get up". ;-) -x86_64/ +x86/x86_64/ - directory with info on Linux support for AMD x86-64 (Hammer) machines. zorro.txt - info on writing drivers for Zorro bus devices found on Amigas. |