---

yaml --- r: 309150 b: refs/heads/master c: f7436a9 h: refs/heads/master v: v3
git-mirror · May 8, 2012 · 815d31b · 815d31b
1 parent 3783b39
commit 815d31b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 024742861124ef26dae4cfc620250f8f47ac934a
+refs/heads/master: f7436a9da902922a48cccc208099763b87d6171f
diff --git a/trunk/arch/x86/realmode/rm/trampoline_32.S b/trunk/arch/x86/realmode/rm/trampoline_32.S
@@ -68,7 +68,7 @@ trampoline_data:
 
 	.data
 	.globl startup_32_smp, boot_gdt, trampoline_status
-
+	.balign	4
 boot_gdt_descr:
 	.word	__BOOT_DS + 7			# gdt limit
 boot_gdt: