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

[Anton Arapov]

commit 4f1fc122a4d23f875952efc2c2819a7e415a991b
Merge: 79cda9f 5aaf69f
Author: Anton Arapov <aarapov at redhat.com>
Date:   Wed Jan 19 16:42:40 2011 +0100

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

 microcode_ctl-manpage-0.patch |   12 ++++++++++++
 microcode_ctl.spec            |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --cc microcode_ctl.spec
index fc272a4,8068652..12e5134
--- 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:        6%{?dist}
 -Release:        10%{?dist}
++Release:        7%{?dist}
  Epoch:          1
  Group:          System Environment/Base
  License:        GPLv2+ and Redistributable, no modification permitted
@@@ -72,21 -74,27 +74,24 @@@ exit 
  
  
  %changelog
 -* 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 )