Linus' tree has a space-tab sequence for a few lines in these files,
causing an unnecessary delta.
Signed-off-by: H. Peter Anvin <[email protected]>
---
commit 7c753dbe7467f0d5ff6904f1bf5840350527e3c4
tree c40a68f6556a702a836d9a6e90f5d632eed0bc0c
parent 0f5a324d655ad582246b6830843114d09835f593
author H. Peter Anvin <[email protected]> Thu, 06 Apr 2006 14:15:53 -0700
committer H. Peter Anvin <[email protected]> Sun, 18 Jun 2006 18:46:34 -0700
arch/i386/kernel/setup.c | 2 +-
arch/x86_64/kernel/setup.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 54c72d9..4945931 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1460,7 +1460,7 @@ #ifdef CONFIG_EFI
efi_enabled = 1;
#endif
- ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+ ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
drive_info = DRIVE_INFO;
screen_info = SCREEN_INFO;
edid_info = EDID_INFO;
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 6d4f025..003667e 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -599,7 +599,7 @@ void __init setup_arch(char **cmdline_p)
{
unsigned long kernel_end;
- ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+ ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
screen_info = SCREEN_INFO;
edid_info = EDID_INFO;
saved_video_mode = SAVED_VIDEO_MODE;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
