]> git.ipfire.org Git - thirdparty/grub.git/commit
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)
commit2cbee7340ce084ff16e801d6e8fcbca80fcd58d4
tree7d9245b913fbf6153d31929c10e918e84fab7d9a
parent850da8e056f54ceec0be4f73749d89d8dce71849
parent72f099578e4da08e1a6845def03f465e65d0729e
Merge branch 'master' into phcoder/scratch

Conflicts:
grub-core/kern/arm/cache_armv6.S
grub-core/kern/uboot/init.c
include/grub/arm/system.h
util/grub-mkconfig.in