merge with mainline

This commit is contained in:
BVK Chaitanya 2010-06-08 09:36:44 +05:30
commit baea17662b
31 changed files with 2794 additions and 319 deletions

View file

@ -18,7 +18,6 @@
*/
#include <grub/term.h>
#include <grub/machine/console.h>
#include <grub/time.h>
#include <grub/cpu/io.h>
#include <grub/misc.h>