merge mainline into bidi

diff --cc Makefile.in
Simple merge

diff --cc commands/help.c
Simple merge

diff --cc conf/common.rmk
Simple merge

diff --cc conf/sparc64-ieee1275.rmk
index ba891307acdf8ec8e4afeaeeee1edbbec5ea0ffe,f0c9b0db79842924d5bc0c05c0e11a86e37a7ffb..49834a1fdbaa562c28b0a47f12a2711d1df3a03e
--- 1/conf/sparc64-ieee1275.rmk
--- 2/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@@ -50,8 -50,9 +50,9 @@@ grub_mkimage_SOURCES = util/grub-mkrawi
  # For grub-setup.
  util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
  grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c       \
+       util/ieee1275/ofpath.c \
        util/misc.c util/getroot.c kern/device.c kern/disk.c    \
 -      kern/err.c kern/misc.c kern/parser.c kern/partition.c   \
 +      kern/err.c kern/misc.c kern/partition.c \
        kern/file.c kern/fs.c kern/env.c kern/list.c            \
        fs/fshelp.c                                             \
        \

diff --cc include/grub/misc.h
Simple merge

diff --cc include/grub/normal.h
Simple merge

diff --cc kern/corecmd.c
Simple merge

diff --cc kern/misc.c
Simple merge

diff --cc normal/main.c
Simple merge

diff --cc normal/menu.c
Simple merge

diff --cc normal/menu_text.c
Simple merge

diff --cc normal/term.c
Simple merge

diff --cc term/efi/console.c
Simple merge

diff --cc term/gfxterm.c
Simple merge

diff --cc term/serial.c
Simple merge

diff --cc term/terminfo.c
Simple merge

diff --cc util/grub-probe.c
Simple merge

diff --cc util/grub-script-check.c
Simple merge

diff --cc util/sparc64/ieee1275/grub-setup.c
Simple merge