diff --git a/[refs] b/[refs] index 5c19f5139dbd..d7fd7e166876 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad68652412276f68ad4fe3e1ecf5ee6880876783 +refs/heads/master: 4bfe24ac1d9d9f06b30b2909f53ea462c72cfe1d diff --git a/trunk/Documentation/x86/boot.txt b/trunk/Documentation/x86/boot.txt index 9efceff51bfb..c25a53e69f1b 100644 --- a/trunk/Documentation/x86/boot.txt +++ b/trunk/Documentation/x86/boot.txt @@ -381,6 +381,7 @@ Protocol: 2.00+ A Gujin B Qemu C Arcturus Networks uCbootloader + D kexec-tools E Extended (see ext_loader_type) F Special (0xFF = undefined) 10 Reserved