[microcode_ctl/f13/master: 8/8] merge from master

[Anton Arapov]

commit aadefb86542fa9b0078fd20e2d14b1885474da91
Merge: 2cdc0db f6a1474
Author: Anton Arapov <aarapov at redhat.com>
Date:   Thu Jan 6 10:18:48 2011 +0100

    merge from master

 .gitignore         |    8 +++-----
 microcode_ctl.spec |    7 +++++--
 sources            |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index ebe2dd2,792ba16..29b0e0f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,9 +1,7 @@@
  clog
  microcode_ctl-1.17
  microcode_ctl-1.17.tar.gz
- microcode-20100209.dat
  amd-ucode-2009-10-09.tar
- /amd-ucode-2009-10-09.tar
- /microcode-20100826.dat
- /microcode_ctl-1.17.tar.gz
- /microcode-20100914.dat
+ microcode-20100826.dat
 -/microcode_ctl-1.17.tar.gz
 -/amd-ucode-2009-10-09.tar
 -/microcode-20100914.dat
 -/microcode-20101123.dat
++microcode-20100914.dat
++microcode-20101123.dat
diff --cc microcode_ctl.spec
index 825e2a1,bd72ff2..8ae9d06
--- 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:        5%{?dist}
 -Release:        9%{?dist}
++Release:        6%{?dist}
  Epoch:          1
  Group:          System Environment/Base
  License:        GPLv2+ and Redistributable, no modification permitted
@@@ -72,15 -72,24 +72,18 @@@ exit 
  
  
  %changelog
+ * Wed Jan 05 2011 Anton Arapov <anton at redhat.com> 1.17-9
+ - 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
 -- 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 )