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)
commitc7ba1ba62e7638d087cc5232e482c0097d696ed0
tree2429bf14f75e07510307fbd19cee5e73bd4972e2
parent6a01f54affc70b25a0a0507775ba159423402387
parent8a3bc88ea740221ae56afdd1545327f45280f112
merge mainline into butter
Makefile.util.def
grub-core/Makefile.core.def
grub-core/kern/emu/getroot.c