[microcode_ctl/f14/master: 9/9] merge from master

[Anton Arapov]

commit 79cda9f1f6906b6b12b3ee207d05819d96d8da10
Author: Anton Arapov <aarapov at redhat.com>
Date:   Thu Jan 6 10:07:55 2011 +0100

    merge from master

 .gitignore |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a62e23..29b0e0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,15 +2,6 @@ clog
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
 amd-ucode-2009-10-09.tar
-<<<<<<< HEAD
-/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
->>>>>>> master
+microcode-20100914.dat
+microcode-20101123.dat