Merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-17 19:18:46 +01:00
commit 88d2919b7d
30 changed files with 213 additions and 161 deletions

View file

@ -329,7 +329,4 @@ grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
grub_video_driver_id_t
grub_video_get_driver_id (void);
grub_video_driver_id_t
grub_video_get_driver_id (void);
#endif /* ! GRUB_VIDEO_HEADER */