]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into luks
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 25 Apr 2011 15:04:27 +0000 (17:04 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 25 Apr 2011 15:04:27 +0000 (17:04 +0200)
1  2 
grub-core/kern/emu/getroot.c

Simple merge