merge mainline into filesys branch

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-31 15:02:07 +01:00
commit 2f70097d3e
28 changed files with 326 additions and 94 deletions

View file

@ -792,7 +792,7 @@ fail:
static char *
read_string (grub_uint8_t *raw, grub_size_t sz)
{
grub_uint16_t *utf16;
grub_uint16_t *utf16 = NULL;
char *ret;
grub_size_t utf16len = 0;