Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus' into x86/core

2009-03-12 11:50:15 +01:00
parent bb7f5f6c26 8229d75438 12074fa107 5e47c478b0 afcfe024ae
commit a98fe7f342
35 changed files with 1204 additions and 268 deletions
@@ -69,8 +69,8 @@ struct detailed_pixel_timing {
 	u8 hborder;
 	u8 vborder;
 	u8 unknown0:1;
-	u8 vsync_positive:1;
 	u8 hsync_positive:1;
+	u8 vsync_positive:1;
 	u8 separate_sync:2;
 	u8 stereo:1;
 	u8 unknown6:1;