]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into newreloc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 5 May 2010 19:41:43 +0000 (21:41 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 5 May 2010 19:41:43 +0000 (21:41 +0200)
1  2 
kern/ieee1275/cmain.c
kern/ieee1275/init.c

Simple merge
Simple merge