]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
projects / thirdparty / grub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 850da8e 72f0995)
Merge branch 'master' into phcoder/scratch
authorVladimir Serbinenko <phcoder@gmail.com>
Mon, 23 Dec 2013 23:33:47 +0000 (00:33 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Mon, 23 Dec 2013 23:33:47 +0000 (00:33 +0100)
Conflicts:
grub-core/kern/arm/cache_armv6.S
grub-core/kern/uboot/init.c
include/grub/arm/system.h

1  2 
util/grub-mkconfig.in patch | diff1 | diff2 | blob | history

diff --cc util/grub-mkconfig.in
Simple merge
Mirror of https://git.savannah.gnu.org/git/grub.git