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)
commit9444311834bb1dd822ed5a89e600906432f23742
treea098ed84b0e3745214ad40061d4797669c894f70
parent41b016a481f590258fdba25f8e184f83a8db0600
parentf86a4030ed43240e5d3ebb4d26822772e2b06acf
merge with mainline
grub-core/kern/mips/startup.S
grub-core/kern/powerpc/ieee1275/startup.S
grub-core/term/at_keyboard.c