merge mainline into videomask

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-16 17:52:17 +01:00
commit 45da21ff5a
154 changed files with 4592 additions and 6246 deletions

View file

@ -17,7 +17,6 @@
*/
#include <grub/loader.h>
#include <grub/machine/machine.h>
#include <grub/machine/memory.h>
#include <grub/machine/loader.h>
#include <grub/normal.h>