merge mainline into hints

diff --cc util/grub-install.in
Simple merge

diff --cc util/ieee1275/ofpath.c
index 69319d58ab43f8d1fdb4462c16366c6fc08aa785,dc16bfde92fcfe0ebb14dc7877bfbee2ad09862a..70d3a46f055205bec9884ed203c56f1ecc52587b
--- 1/util/ieee1275/ofpath.c
--- 2/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@@ -245,10 -233,9 +245,10 @@@ of_path_of_ide(char *of_path
    p = get_basename (sysfs_path);
    sscanf(p, "%d.%d", &chan, &devno);
  
-   ret = __of_path_common(of_path, sysfs_path, device, devno);
 -  __of_path_common(of_path, sysfs_path, device, 2 * chan + devno);
++  ret = __of_path_common(of_path, sysfs_path, device, 2 * chan + devno);
  
    free (sysfs_path);
 +  return ret;
  }
  
  static int