[uboot-tools/f19: 9/9] fix merge

[Peter Robinson]

commit 13ed032d206b66bcd42db673da103eeef39bd304
Merge: 68ca48e 86207dd
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Sep 2 21:08:24 2013 +0100

    fix merge

 0001-Add-wandboard-quad-support.patch              |   81 ++++++++++++++++
 ...default-to-beaglebone-black-for-unknown-E.patch |   27 ------
 ...don-t-hang-on-unknown-EEPROMs-assume-Beag.patch |    6 +-
 ...ebone-HACK-always-return-1-for-is_bone_lt.patch |   12 +-
 0004-beaglebone-HACK-raise-USB-current-limit.patch |   10 +-
 ...use-kloadaddr-to-avoid-copying-the-kernel.patch |   12 +-
 ...e-try-to-load-uEnv-uImage-from-eMMC-first.patch |   10 +-
 ...Don-t-trigger-uboot-variable-lenght-limit.patch |   12 +-
 ...HACK-change-mmc-order-to-avoid-u-boot-cra.patch |   10 +-
 ...e-update-bootpart-variable-after-mmc-scan.patch |   10 +-
 0010-am335x_evm-enable-gpio-command.patch          |   10 +-
 ...m335x_evm-HACK-to-turn-on-BeagleBone-LEDs.patch |   14 ++--
 ...een-rolling-when-video-played-back-in-bro.patch |    6 +-
 ...e-enable-CONFIG_SUPPORT_RAW_INITRD-option.patch |   10 +-
 0014-mmc-Add-RSTN-enable-for-emmc.patch            |   50 +++++-----
 ...dd-pxe-support-set-default-boot-command-l.patch |   97 ++++++++++++++++++++
 omap4-panda-memtiming.patch                        |   11 ++
 sources                                            |    2 +-
 uEnv.txt.beagle                                    |    3 +-
 uEnv.txt.beagle_xm                                 |    3 +-
 uEnv.txt.beaglebone                                |    3 +-
 uboot-tools.spec                                   |   62 +++++++------
 uboot-wandboard-quad.patch                         |   38 --------
 23 files changed, 316 insertions(+), 183 deletions(-)
---
diff --cc uboot-tools.spec
index eec8355,3d3caf5..e4b4f5b
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@@ -348,13 -343,21 +343,24 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
+ * Sun Sep  1 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2013.07-2
+ - Add patch for Panda ES memory type issue
+ 
+ * Fri Jul 26 2013 Dennis Gilmore <dennis at ausil.us> - 2013.07-1
+ - update to 2013.07 final 
+ 
+ * Thu Jul 18 2013 Dennis Gilmore <dennis at ausil.us> - 2013.07-0.2.rc3
+ - update to 2013.07 rc3
+ - set wandboard to use extlinux.conf by default
+ 
+ * Thu Jul 04 2013 Dennis Gilmore <dennis at ausil.us> - 2013.07-0.1.rc2
+ - update beaglebone patches 
+ - update wandboard quad patch
+ - upstream 2013.07-rc2 update
+ 
 +* Mon Jun 17 2013 Dennis Gilmore <dennis at ausil.us> - 2013.04-5.1
 +- dont apply ext mlo patches
 +
  * Wed Jun 05 2013 Dennis Gilmore <dennis at ausil.us> - 2013.04-5
  - add patches to support ext filesystems in exynos and omap SPL's
  - drop bringing in arm-boot-config on arm systems