merge mainline into 4096

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-23 04:08:37 +02:00
commit a5edbcb3a1
393 changed files with 15834 additions and 2186 deletions

View file

@ -24,6 +24,8 @@
#include <grub/misc.h>
#include <grub/dl.h>
GRUB_MOD_LICENSE ("GPLv3+");
static struct grub_partition_map grub_msdos_partition_map;