Merge branch 'cjwatson/timeout-style'

diff --cc ChangeLog
index c1dad3b,3811886..3e1ace4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,112 -1,19 +1,128 @@@
 -2013-11-28  Colin Watson  <cjwatson@ubuntu.com>
++2013-12-03  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       Add a new timeout_style environment variable and a corresponding
+       GRUB_TIMEOUT_STYLE configuration key for grub-mkconfig.  This
+       controls hidden-timeout handling more simply than the previous
+       arrangements, and pressing any hotkeys associated with menu entries
+       during the hidden timeout will now boot the corresponding menu entry
+       immediately.
+ 
+       GRUB_HIDDEN_TIMEOUT=<non-empty> + GRUB_TIMEOUT=<non-zero> now
+       generates a warning, and if it shows the menu it will do so as if
+       the second timeout were not present.  Other combinations are
+       translated into reasonable equivalents.
+ 
+       Based loosely on work by Franz Hsieh.  Fixes Ubuntu bug #1178618.
+ 
 +2013-12-02  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/config.c: Add missing pointer adjustment.
 +      Reported by: qwertial
 +
 +2013-11-30  Andrey Borzenkov <arvidjaar@gmail.com>
 +
 +      * grub-core/kern/arm64/dl_helper.c: Include grub/arm64/reloc.h
 +      directly, not via `cpu' link, to fix libgrub.pp generation.
 +
 +2013-11-30  Leif Lindholm <leif.lindholm@linaro.org>
 +
 +      New port arm64-efi.
 +
 +2013-11-30  Andrey Borzenkov <arvidjaar@gmail.com>
 +
 +      * docs/grub.texi (sleep): Document exit codes.
 +
 +2013-11-30  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Ensure that -mno-unaligned-access or some equivalent option is used.
 +
 +2013-11-30  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/lib/libgcrypt/mpi/longlong.h: Fix compilation error with
 +      -march=armv3.
 +
 +2013-11-30  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Remove leftover GRUB_IA64_DL_TRAMP_SIZE.
 +
 +2013-11-29  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      * docs/grub-dev.texi (Font Metrics): Exclude @image command from DVI
 +      builds, since we don't have an EPS version of font_char_metrics.png.
 +      Add leading dot to image extension per the Texinfo documentation.
 +
 +2013-11-29  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
 +      <freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
 +      * util/grub-gen-widthspec.c: Likewise.
 +      * util/grub-mkfont.c: Likewise.
 +
 +2013-11-29  Andrey Borzenkov <arvidjaar@gmail.com>
 +
 +      * util/grub-setup.c (main): Move parsing of (hdX) syntax to ...
 +      * util/setup.c (SETUP): ... here. Fixes regression: grub-install
 +      failed to install on (hdX).
 +      * util/grub-setup.c (get_device_name): Remove, not needed after
 +      above change.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/kern/emu/hostfs.c (is_dir): Remove variable length arrays.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/grub-fstest.c: Remove variable length arrays.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/osdep/linux/ofpath.c: Check return value of read.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/mkimage.c (grub_install_generate_image): Use grub_crypto_hash for
 +      computing crc32 rather than handling with md fundtions directly.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/mkimage.c (grub_install_generate_image): Use grub_crypto_hash for
 +      checking fwstart.img rather than md fundtions directly.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/grub-mkrescue.c (main): Check that fread succeeded.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * conf/Makefile.common: Remove -mexplicit-relocs and
 +      -DUSE_ASCII_FALLBACK on yeeloong.
 +
 +      -DUSE_ASCII_FALLBACK is already added by font snippets.
 +      -mexplicit-relocs isn't needed is compiler/assemblera are
 +      configured properly.
 +      If they're not we shouldn't attempt to fix it by ourselves.
 +      Binary compare between before and after shows no difference.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/Makefile.core.def: Remove libgnulib.a and use its
 +      sources in dependencies directly.
 +
 +      This was the only instance of "library" in core config. A bug was
 +      reported that -fno-stack-protector wasn't passed to it. Instead of
 +      figuring out why it failed just remove this construction used
 +      needlessly.
 +
 +2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/osdep/unix/password.c (grub_password_get): Check that
 +      fgets succeeded.
 +
 +2013-11-27  Francesco Lavra  <francescolavra.fl@gmail.com>
 +
 +      * docs/grub.texi (ls): Fix command description in case of a device name
 +      passed as argument.
 +
  2013-11-27  Vladimir Serbinenko  <phcoder@gmail.com>
  
        Eliminate variable length arrays in grub_vsnprintf_real.

diff --cc docs/grub.texi
Simple merge