merge mainline into net

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-24 22:20:50 +02:00
commit 8f72becdef
45 changed files with 2702 additions and 1144 deletions

View file

@ -33,6 +33,8 @@
#include <grub/mm.h>
#include <grub/cpu/relocator.h>
GRUB_MOD_LICENSE ("GPLv3+");
static grub_dl_t my_mod;
static struct grub_relocator *rel;
static grub_uint32_t ebx = 0xffffffff;