merge with mainline

2010-07-13 00:43:28 +05:30 · 2010-07-13 00:43:28 +05:30 · 297f0c2b6e
commit 297f0c2b6e
parent d270972ab0 e4f4eafc91
218 changed files with 35637 additions and 4957 deletions
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@ -33,6 +33,7 @@
 #include <hurd.h>
 #include <hurd/lookup.h>
 #include <hurd/fs.h>
+#include <sys/mman.h>
 #endif

 #include <grub/mm.h>