diff --git a/[refs] b/[refs]
index 426fa83745b2..e556558fdf6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca27ac4cc6caa73740122a5f3d601c8a27b89e7c
+refs/heads/master: 6bf1d73d7a512cfa791b7415742f71c80f6b8d7e
diff --git a/trunk/Documentation/fb/intelfb.txt b/trunk/Documentation/fb/intelfb.txt
index aa0d322db171..da5ee74219e8 100644
--- a/trunk/Documentation/fb/intelfb.txt
+++ b/trunk/Documentation/fb/intelfb.txt
@@ -88,12 +88,20 @@ Sample Usage
 
 In /etc/lilo.conf, add the line:
 
-append="video=intelfb:800x600-32@75,accel,hwcursor,vram=8"
+append="video=intelfb:mode=800x600-32@75,accel,hwcursor,vram=8"
 
 This will initialize the framebuffer to 800x600 at 32bpp and 75Hz. The
 framebuffer will use 8 MB of System RAM. hw acceleration of text and cursor
 will be enabled.
 
+Remarks
+-------
+
+If setting this parameter doesn't work (you stay in a 80x25 text-mode),
+you might need to set the "vga=<mode>" parameter too - see vesafb.txt
+in this directory.
+
+
 D.  Module options
 
 	The module parameters are essentially similar to the kernel