[microcode_ctl/f14/master: 6/6] Merge branch 'master' into f14

[Anton Arapov]

commit 7508178d6b091a4f61b78c34cdb4eb415c665ef2
Merge: 4f1fc12 9ab83da
Author: Anton Arapov <aarapov at redhat.com>
Date:   Mon Mar 7 08:55:36 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	microcode_ctl.spec

 .gitignore         |    8 +++-----
 microcode_ctl.spec |   15 +++++++++------
 sources            |    2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 29b0e0f,4311c2c..2dd420f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,10 +1,5 @@@
  clog
  microcode_ctl-1.17
--microcode_ctl-1.17.tar.gz
--amd-ucode-2009-10-09.tar
--microcode-20100826.dat
- microcode-20100914.dat
- microcode-20101123.dat
+ /microcode_ctl-1.17.tar.gz
 -/amd-ucode-2009-10-09.tar
 -/microcode-20100914.dat
+ /microcode-20101123.dat
+ /amd-ucode-2011-01-11.tar
diff --cc microcode_ctl.spec
index 12e5134,6c6b77f..a440e95
--- a/microcode_ctl.spec
+++ b/microcode_ctl.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary:        Tool to update x86/x86-64 CPU microcode.
  Name:           microcode_ctl
  Version:        1.17
- Release:        7%{?dist}
 -Release:        12%{?dist}
++Release:        8%{?dist}
  Epoch:          1
  Group:          System Environment/Base
  License:        GPLv2+ and Redistributable, no modification permitted
@@@ -74,24 -74,33 +74,27 @@@ exit 
  
  
  %changelog
 -* Mon Mar 07 2011 Anton Arapov <anton at redhat.com> 1.17-12
++* Mon Mar 07 2011 Anton Arapov <anton at redhat.com> 1.17-8
+ - Update to amd-ucode-2011-01-11.tar
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.17-11
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Wed Jan 19 2011 Anton Arapov <anton at redhat.com> 1.17-10
 +* Wed Jan 19 2011 Anton Arapov <anton at redhat.com> 1.17-7
  - manpage fix (John Bradshaw ) [#670879]
  
 -* Wed Jan 05 2011 Anton Arapov <anton at redhat.com> 1.17-9
 +* Wed Jan 05 2011 Anton Arapov <anton at redhat.com> 1.17-6
  - Update to microcode-20101123.dat
  
 -* Mon Nov 01 2010 Anton Arapov <anton at redhat.com> 1.17-8
 +* Mon Nov 01 2010 Anton Arapov <anton at redhat.com> 1.17-5
  - Update to microcode-20100914.dat
  
 -* Wed Sep 29 2010 jkeating - 1:1.17-7
 +* Wed Sep 29 2010 jkeating - 1:1.17-4.1
  - Rebuilt for gcc bug 634757
  
 -* Wed Sep 15 2010 Anton Arapov <anton at redhat.com> 1.17-6
 +* Wed Sep 15 2010 Anton Arapov <anton at redhat.com> 1.17-4
  - Update to microcode-20100826.dat
  
 -* Tue Sep 07 2010 Toshio Kuratomi <toshio at fedoraproject.org> 1.17-5
 +* Tue Sep 07 2010 Toshio Kuratomi <toshio at fedoraproject.org> 1.17-3.1
  - Fix license tag: bz#450491
  
 -* Fri Aug 27 2010 Dave Jones <davej at redhat.com> 1.17-4
 -- Update to microcode-20100826.dat
 -
  * Tue Mar 23 2010 Anton Arapov <anton at redhat.com> 1.17-3
  - Fix the udev rules (Harald Hoyer )