Merge mainline into usb

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-17 02:44:33 +02:00
commit b92c6ff67f
5 changed files with 48 additions and 5 deletions

View file

@ -63,6 +63,8 @@
#define GRUB_PC_PARTITION_OPENBSD_TYPE_NTFS 18
#define GRUB_PC_PARTITION_OPENBSD_TYPE_RAID 19
#define GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION 2
/* The BSD partition entry. */
struct grub_partition_bsd_entry
{