diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-09 04:42:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-09 04:42:21 -0500 |
| commit | 4385428a477559b26736cc3c80d8b68f31126c71 (patch) | |
| tree | 8eb0cbc78e79c368687fa13a1e0674ae537f830f /Documentation/x86/boot.txt | |
| parent | 047a3772feaae8e43d81d790f3d3f80dae8ae676 (diff) | |
| parent | 2d75af2f2a7a6103a6d539a492fe81deacabde44 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'Documentation/x86/boot.txt')
| -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+ | |||
| 600 | 0x00000001 lguest | 600 | 0x00000001 lguest |
| 601 | 0x00000002 Xen | 601 | 0x00000002 Xen |
| 602 | 0x00000003 Moorestown MID | 602 | 0x00000003 Moorestown MID |
| 603 | 0x00000004 CE4100 TV Platform | ||
| 603 | 604 | ||
| 604 | Field name: hardware_subarch_data | 605 | Field name: hardware_subarch_data |
| 605 | Type: write (subarch-dependent) | 606 | Type: write (subarch-dependent) |