merge with mainline

This commit is contained in:
BVK Chaitanya 2010-08-23 21:50:38 +05:30
commit 9444311834
4 changed files with 13 additions and 8 deletions

View file

@ -148,7 +148,7 @@ compressed:
VARIABLE(grub_prefix)
/* to be filled by grub-mkelfimage */
/* to be filled by grub-mkimage */
/*
* Leave some breathing room for the prefix.

View file

@ -33,7 +33,7 @@ _start:
. = _start + GRUB_KERNEL_MACHINE_PREFIX
VARIABLE(grub_prefix)
/* to be filled by grub-mkelfimage */
/* to be filled by grub-mkimage */
/*
* Leave some breathing room for the prefix.