diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afa36d19c8f..3879f3882cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-08  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/atom.md (atom_sse_4): Merge atom_sse_attr attibutes.
+	(atom_sse_5): Ditto.
+
 2012-10-08  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR target/54400
@@ -149,7 +154,8 @@
 
 	PR target/54685
 	* config/sh/sh.md (one_cmplsi2): Make insn_and_split.  Add manual
-	combine matching for an insn sequence where a ge:SI pattern can be used.
+	combine matching for an insn sequence where a ge:SI pattern
+	can be used.
 
 2012-10-08  Dodji Seketeli  <dodji@redhat.com>
 
diff --git a/gcc/config/i386/atom.md b/gcc/config/i386/atom.md
index f24fd5ca824..4e0b0c04d53 100644
--- a/gcc/config/i386/atom.md
+++ b/gcc/config/i386/atom.md
@@ -544,16 +544,14 @@
 (define_insn_reservation  "atom_sse_4" 1
   (and (eq_attr "cpu" "atom")
        (and (eq_attr "type" "sse")
-            (ior (eq_attr "atom_sse_attr" "fence")
-                 (eq_attr "atom_sse_attr" "prefetch"))))
+            (eq_attr "atom_sse_attr" "fence,prefetch")))
   "atom-simple-0")
 
 ;; rcpps, rsqrtss, sqrt, ldmxcsr
 (define_insn_reservation  "atom_sse_5" 7
   (and (eq_attr "cpu" "atom")
        (and (eq_attr "type" "sse")
-            (ior (ior (eq_attr "atom_sse_attr" "sqrt")
-                      (eq_attr "atom_sse_attr" "mxcsr"))
+            (ior (eq_attr "atom_sse_attr" "sqrt,mxcsr")
                  (and (eq_attr "atom_sse_attr" "rcp")
                       (eq_attr "mode" "V4SF")))))
   "atom-complex, atom-all-eu*6")