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

@ -221,9 +221,6 @@ grub_find_root_device_from_mountinfo (const char *dir, char **relroot)
/* Now scan visible mounts for the ones we're interested in. */
for (i = entry_len - 1; i >= 0; i--)
{
if (entries[i].major != 0)
continue; /* not a virtual device */
if (!*entries[i].device)
continue;