]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
projects / thirdparty / grub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2b8ed7 adabfb5)
Merge branch 'master' into phcoder/scratch
authorVladimir Serbinenko <phcoder@gmail.com>
Mon, 23 Dec 2013 03:16:55 +0000 (04:16 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Mon, 23 Dec 2013 03:16:55 +0000 (04:16 +0100)
1  2 
grub-core/Makefile.core.def patch | diff1 | diff2 | blob | history
grub-core/kern/arm/cache.c patch | diff1 | diff2 | blob | history

diff --cc grub-core/Makefile.core.def
Simple merge
diff --cc grub-core/kern/arm/cache.c
Simple merge
Mirror of https://git.savannah.gnu.org/git/grub.git