Merge mainline into arm

.bzrignore

@@ -7,11 +7,14 @@
 *.1
 *.8
 aclocal.m4
+ahci_test
 ascii.bitmaps
 ascii.h
 autom4te.cache
 build_env.mk
 .bzrignore
+cdboot_test
+cmp_test
 config.cache
 config.guess
 config.h
@@ -21,22 +24,29 @@ config.log
 config.status
 config.sub
 configure
+core_compress_test
 DISTLIST
 docs/*.info
 docs/stamp-vti
 docs/version.texi
+ehci_test
 *.elf
 example_grub_script_test
 example_scripted_test
 example_unit_test
 *.exec
+fddboot_test
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
+gettext_strings_test
 grub-bin2h
 grub-bios-setup
+grub_cmd_date
 grub_cmd_echo
 grub_cmd_regexp
+grub_cmd_set_date
+grub_cmd_sleep
 grub-editenv
 grub-emu
 grub_emu_init.c
@@ -44,6 +54,7 @@ grub_emu_init.h
 grub-fstest
 grub_fstest_init.c
 grub_fstest_init.h
+grub_func_test
 grub-install
 grub-kbdcomp
 grub-macho2img
@@ -67,15 +78,22 @@ grub_script_continue
 grub_script_dollar
 grub_script_echo1
 grub_script_echo_keywords
+grub_script_escape_comma
+grub_script_eval
 grub_script_expansion
 grub_script_final_semicolon
 grub_script_for1
 grub_script_functions
+grub_script_gettext
 grub_script_if
+grub_script_leading_whitespace
+grub_script_no_commands
 grub_script_not
 grub_script_return
 grub_script_setparams
 grub_script_shift
+grub_script_strcmp
+grub_script_test
 grub_script_vars1
 grub_script_while1
 grub_script.tab.c
@@ -89,6 +107,9 @@ grub_setup_init.h
 grub-shell
 grub-shell-tester
 grub-sparc64-setup
+gzcompress_test
+hddboot_test
+help_test
 *.img
 *.image
 include/grub/cpu
@@ -96,27 +117,38 @@ include/grub/machine
 install-sh
 lib/libgcrypt-grub
 libgrub_a_init.c
+*.log
 *.lst
+lzocompress_test
 *.marker
 Makefile
 *.mod
 mod-*.c
 missing
+netboot_test
+ohci_test
 partmap_test
+pata_test
 *.pf2
 *.pp
 po/*.mo
 po/grub.pot
 po/POTFILES
 po/stamp-po
+printf_test
+priority_queue_unit_test
+pseries_test
 stamp-h
 stamp-h1
 stamp-h.in
 symlist.c
 symlist.h
 trigtables.c
+*.trs
+uhci_test
 update-grub_lib
 unidata.c
+xzcompress_test
 Makefile.in
 GPATH
 GRTAGS
@@ -178,3 +210,8 @@ grub-core/lib/dtc-grub
 grub-core/Makefile.libfdt.def
 po/POTFILES.in
 po/POTFILES-shell.in
+grub-glue-efi
+grub-render-label
+grub-core/gnulib/locale.h
+grub-core/gnulib/unitypes.h
+grub-core/gnulib/uniwidth.h