merge mainline into grub-file

author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Fri, 26 Mar 2010 16:06:36 +0000 (17:06 +0100)

committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Fri, 26 Mar 2010 16:06:36 +0000 (17:06 +0100)
author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 26 Mar 2010 16:06:36 +0000 (17:06 +0100)
committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 26 Mar 2010 16:06:36 +0000 (17:06 +0100)
diff --cc genmk.rb
Simple merge
diff --cc include/grub/mm.h
Simple merge
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Fri, 26 Mar 2010 16:06:36 +0000 (17:06 +0100)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Fri, 26 Mar 2010 16:06:36 +0000 (17:06 +0100)
		1	2
genmk.rb	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history