Merge branch 'mainline' into relocator

author phcoder <phcoder@debian.bg45.phnet>

Sun, 20 Sep 2009 17:38:16 +0000 (19:38 +0200)

committer phcoder <phcoder@debian.bg45.phnet>

Sun, 20 Sep 2009 17:38:16 +0000 (19:38 +0200)
author phcoder <phcoder@debian.bg45.phnet>
Sun, 20 Sep 2009 17:38:16 +0000 (19:38 +0200)
committer phcoder <phcoder@debian.bg45.phnet>
Sun, 20 Sep 2009 17:38:16 +0000 (19:38 +0200)
diff --cc gendistlist.sh

index 5fe5d186bd229edd062dc61f7ee23dadebd37df9,3278ed0b3905d3ac381e0a65fa2526927bbd1556..3278ed0b3905d3ac381e0a65fa2526927bbd1556

mode 100644,100644..100755
--- 1/gendistlist.sh
--- 2/gendistlist.sh
+++ b/gendistlist.sh
diff --cc include/grub/i386/pc/memory.h
Simple merge
author	phcoder <phcoder@debian.bg45.phnet>
	Sun, 20 Sep 2009 17:38:16 +0000 (19:38 +0200)
committer	phcoder <phcoder@debian.bg45.phnet>
	Sun, 20 Sep 2009 17:38:16 +0000 (19:38 +0200)
		1	2
gendistlist.sh	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/i386/pc/memory.h	patch \|	diff1 \|	diff2 \|	blob \| history