[grub2/f17: 35/35] Merge branch 'f18' into f17

[Peter Jones]

commit b2ba2fbd9c9e58c670d7e7e4c5809b84bf20645c
Merge: 29be933 d86e0a2
Author: Peter Jones <pjones at redhat.com>
Date:   Thu Jan 31 11:39:28 2013 -0500

    Merge branch 'f18' into f17
    
    Conflicts:
    	grub2.spec

 add-vlan-tag-support.patch                         |  185 ++++++++
 follow-the-symbolic-link-ieee1275.patch            |   27 ++
 grub-2.00-Add-fwsetup.patch                        |   38 +-
 grub-2.00-Dont-set-boot-on-ppc.patch               |    9 +-
 grub-2.00-Handle-escapes-in-labels.patch           |  186 ++++++++
 ...ue-separate-DNS-queries-for-ipv4-and-ipv6.patch |  230 ++++++++++
 grub-2.00-add-X-option-to-printf-functions.patch   |   58 +++
 ....patch => grub-2.00-add-fw_path-search_v2.patch |   30 +-
 grub-2.00-cas-reboot-support.patch                 |  174 +++++++
 ....00-dhcp-client-id-and-uuid-options-added.patch |  121 +++++
 grub-2.00-dont-decrease-mmap-size.patch            |   34 ++
 grub-2.00-efidisk-ahci-workaround.patch            |   60 +++
 grub-2.00-fix-http-crash.patch                     |   28 ++
 ...ppc-include-all-modules-in-the-core-image.patch |  332 ++++++++++++++
 grub-2.00-ieee1276.patch                           |   16 -
 grub-2.00-linux-mbr.patch                          |   82 ----
 grub-2.00-no-canon.patch                           |   29 --
 grub-2.00-no-double-free.patch                     |   17 -
 grub-2.00-no-huge-video.patch                      |   67 ---
 grub-2.00-no-insmod-on-sb.patch                    |  113 +++++
 grub-2.00-ppc-hints.patch                          |  157 -------
 grub-2.00-ppc-usb-quiesce.patch                    |   89 ----
 ...arch-for-specific-config-file-for-netboot.patch |  205 +++++++++
 grub-2.00-support-vscsi-on-ibm-ppc.patch           |  162 -------
 ...-2.00-who-trusts-you-and-who-do-you-trust.patch |  217 +++++++++
 grub2-add-bootpath-device-to-the-list.patch        |   54 +++
 grub2-cdpath.patch                                 |   25 +
 grub2-linuxefi.patch                               |  480 ++++++++++++++++++++
 grub2-use-linuxefi.patch                           |   50 ++
 grub2.spec                                         |  153 ++++++-
 sources                                            |    4 +-
 31 files changed, 2751 insertions(+), 681 deletions(-)
---