merge with mainline

This commit is contained in:
BVK Chaitanya 2010-07-11 17:55:26 +05:30
commit e57a453ad1
217 changed files with 35601 additions and 4892 deletions

View file

@ -49,4 +49,8 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
extern char * canonicalize_file_name (const char *path);
#ifdef HAVE_DEVICE_MAPPER
int grub_device_mapper_supported (void);
#endif
#endif /* GRUB_EMU_MISC_H */