]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge 4096 into luks
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 24 Apr 2011 12:53:13 +0000 (14:53 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 24 Apr 2011 12:53:13 +0000 (14:53 +0200)
1  2 
grub-core/kern/disk.c

Simple merge