[dtc/el6: 5/5] Merge remote branch 'origin/master' into el6

[bonzini]

commit f2d3f878f82c076311b5891ae7a62f385f0d83d7
Merge: 50da1c7 498afd0
Author: Paolo Bonzini <pbonzini at redhat.com>
Date:   Wed Jun 26 12:01:37 2013 +0200

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
            dtc.spec

 .gitignore                                       |    1 +
 dtc-check.patch                                  |   65 ----------------------
 dtc-flattree.patch                               |   52 -----------------
 dtc.spec                                         |   13 ++--
 sources                                          |    2 +-
 use-tx-as-the-type-specifier-instead-of-zx.patch |   57 +++++++++++++++++++
 6 files changed, 65 insertions(+), 125 deletions(-)
---
diff --cc dtc.spec
index de17a09,927e46a..e4a5c64
--- a/dtc.spec
+++ b/dtc.spec
@@@ -77,8 -73,17 +73,11 @@@ rm -rf $RPM_BUILD_ROO
  /sbin/ldconfig
  
  %changelog
+ * Mon Jun 24 2013 Josh Boyer <jwboyer at redhat.com> - 1.4.0-1
+ - New dtc 1.4.0 release (rhbz 977480)
+ 
 -* Thu Jun 06 2013 Josh Boyer <jwboyer at redhat.com> - 1.3.0-8
 -- Fix type specifier error (from Dan Horák)
 -
 -* Mon Jun 03 2013 Josh Boyer <jwboyer at redhat.com> - 1.3.0-7
 -- Update dtc to include libfdt_env.h (rhbz 969955)
 -
 -* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-6
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +* Tue Jun 4 2013 Paolo Bonzini <pbonzini at redhat.com> - 1.3.0-6
 +- Install libfdt_env.h too (rhbz 969955)
  
  * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild