projects / grub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41b016a f86a403)
merge with mainline
authorBVK Chaitanya <bvk@dbook>
Mon, 23 Aug 2010 16:20:38 +0000 (21:50 +0530)
committerBVK Chaitanya <bvk@dbook>
Mon, 23 Aug 2010 16:20:38 +0000 (21:50 +0530)
1  2 
grub-core/kern/mips/startup.S patch | diff1 | diff2 | blob | history
grub-core/kern/powerpc/ieee1275/startup.S patch | diff1 | diff2 | blob | history
grub-core/term/at_keyboard.c patch | diff1 | diff2 | blob | history

diff --cc grub-core/kern/mips/startup.S
Simple merge
diff --cc grub-core/term/at_keyboard.c
Simple merge
GRUB2 development