diff --git a/[refs] b/[refs]
index 02bc060206fe..b4b4d31443da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efb21cc2384e385c4873ac6e7b23f16659469ea9
+refs/heads/master: 32926b3be19fa4859c02f248a342f2d62822dcfe
diff --git a/trunk/arch/um/include/asm/atomic.h b/trunk/arch/um/include/asm/atomic.h
deleted file mode 100644
index b683f1034d1e..000000000000
--- a/trunk/arch/um/include/asm/atomic.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __UM_ATOMIC_H
-#define __UM_ATOMIC_H
-
-/* The i386 atomic.h calls printk, but doesn't include kernel.h, so we
- * include it here.
- */
-#include "linux/kernel.h"
-
-#include "asm/arch/atomic.h"
-
-#endif