merge mainline into butter
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 11 Apr 2011 05:56:31 +0000 (07:56 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 11 Apr 2011 05:56:31 +0000 (07:56 +0200)
1  2 
Makefile.util.def
grub-core/Makefile.core.def
grub-core/kern/emu/getroot.c

Simple merge
Simple merge
Simple merge