diff --git a/[refs] b/[refs]
index fc4fda8ce35f..eb5a61e41912 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a226c6f5c374a0d565dac609907085b944979b5
+refs/heads/master: 2502c64eeb125c5d57e3e7dc38320b500d69e088
diff --git a/trunk/arch/mn10300/include/asm/elf.h b/trunk/arch/mn10300/include/asm/elf.h
index a30d220de5ca..8157c9267f42 100644
--- a/trunk/arch/mn10300/include/asm/elf.h
+++ b/trunk/arch/mn10300/include/asm/elf.h
@@ -31,6 +31,12 @@
 #define R_MN10300_SYM_DIFF	33	/* Adjustment when relaxing. */
 #define R_MN10300_ALIGN 	34	/* Alignment requirement. */
 
+/*
+ * AM33/AM34 HW Capabilities
+ */
+#define HWCAP_MN10300_ATOMIC_OP_UNIT	1	/* Has AM34 Atomic Operations */
+
+
 /*
  * ELF register definitions..
  */
@@ -128,7 +134,11 @@ do {						\
  * instruction set this CPU supports.  This could be done in user space,
  * but it's not easy, and we've already done it here.
  */
+#ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT
+#define ELF_HWCAP	(HWCAP_MN10300_ATOMIC_OP_UNIT)
+#else
 #define ELF_HWCAP	(0)
+#endif
 
 /*
  * This yields a string that ld.so will use to load implementation