commit 6d0b842d3bf0cc027dcff57a89fb8a6b1fd610e1 Author: Linus Torvalds Date: Thu Sep 20 11:33:45 2007 -0700 Fix CRLF line endings in Documentation/input/iforce-protocol.txt Emil Medve points out that this documentation file uses CRLF line endings, which means that if you use [core] autocrlf=input (which makes sense if you ever develop under Windows, for example, or if you use other broken tools) in your git config, git will always complain about the file being dirty. This removes the bogus DOS line endings, and removes whitespace at the end of line. Cc: Emil Medve Signed-off-by: Linus Torvalds commit bbc15f46fe4dc2862325e2b4ba474a854162e1a1 Author: Paul Bolle Date: Mon Sep 10 23:39:02 2007 +0200 [x86 setup] Fix typo in arch/i386/boot/header.S There's an obvious typo in arch/i386/boot/header.S (in your linux-2.6-x86setup.git) that I noticed by just studying the code. Signed-off-by: Paul Bolle Signed-off-by: H. Peter Anvin commit 91c4b8cb5ab8cc3e8352739e35699c0487a6b6f3 Author: H. Peter Anvin Date: Thu Sep 13 14:16:37 2007 -0700 [acpi] Correct the decoding of video mode numbers in wakeup.S wakeup.S looks at the video mode number from the setup header and looks to see if it is a VESA mode. Unfortunately, the decoding is done incorrectly and it will attempt to frob the VESA BIOS for any mode number 0x0200 or larger. Correct this, and remove a bunch of #if 0'd code. Massive thanks to Jeff Chua for reporting the bug, and suffering though a large number of experiments in order to track this problem down. Cc: Pavel Machek Signed-off-by: H. Peter Anvin commit 3f662b3f6e422a15fefcbaf4bdd21f97e6bcf32d Author: H. Peter Anvin Date: Thu Sep 13 14:14:29 2007 -0700 [x86 setup] Present the canonical video mode number to the kernel Canonicalize the video mode number as presented to the kernel. The video mode number may be user-entered (e.g. ASK_VGA), an alias (e.g. NORMAL_VGA), or a size specification, and that confuses the suspend wakeup code. Signed-off-by: H. Peter Anvin