merge mainline into luks

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-25 17:04:27 +02:00
commit 8c767fd198
30 changed files with 143 additions and 18 deletions

View file

@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss)
.byte 0xb8
VARIABLE(grub_relocator16_sp)
.word 0
movw %ax, %ss
movzwl %ax, %esp
/* movw imm32, %edx. */
.byte 0x66, 0xba