diff options
| author | Thomas Gleixner | 2010-12-09 18:19:13 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2010-12-09 18:19:21 +0100 |
| commit | 51ddafcbc735155a7e946b8b6ff19fcd5351375b (patch) | |
| tree | 4900cfc546494d84cdbf0b693d89b5a130d5f0ee /Documentation | |
| parent | Merge branch 'x86/amd-nb' into x86/apic-cleanups (diff) | |
| parent | x86, earlyprintk: Move mrst early console to platform/ and fix a typo (diff) | |
| download | kernel-qcow2-linux-51ddafcbc735155a7e946b8b6ff19fcd5351375b.tar.gz kernel-qcow2-linux-51ddafcbc735155a7e946b8b6ff19fcd5351375b.tar.xz kernel-qcow2-linux-51ddafcbc735155a7e946b8b6ff19fcd5351375b.zip | |
Merge branch 'x86/platform' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb and x86/platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/boot.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 30b43e1b2697..bdeb81ccb5f6 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt @@ -600,6 +600,7 @@ Protocol: 2.07+ 0x00000001 lguest 0x00000002 Xen 0x00000003 Moorestown MID + 0x00000004 CE4100 TV Platform Field name: hardware_subarch_data Type: write (subarch-dependent) |