vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-29 22:05:46 +02:00
parent 0b986c402b 5303b85d44
commit 4847f93e2a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -278,6 +278,15 @@
(grub_xnu_register_memory): Simplified.
* grub-core/loader/xnu_resume.c (grub_xnu_resume): Use relocator.
2010-08-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/charset.c (grub_utf8_to_ucs4_alloc): Avoid deadloop
on malloc error.
(grub_bidi_logical_to_visual): Check that malloc succeded.
* grub-core/normal/term.c (grub_puts_terminal): Fix fallback to dumb
puts.
(grub_xputs_normal): Likewise.
2010-08-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.core.def (kernel): Add kern/mips/cache_flush.S to