diff --git a/[refs] b/[refs]
index e13981dcdb36..9001d125e57d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cc747e96480d4e26560e5bc59f2b9c9204ade0e
+refs/heads/master: b28d2582ce8aafe531d909bb9c4dcf29189e786e
diff --git a/trunk/include/asm-ppc64/segment.h b/trunk/include/asm-ppc64/segment.h
deleted file mode 100644
index d80fb68cc79e..000000000000
--- a/trunk/include/asm-ppc64/segment.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __PPC64_SEGMENT_H
-#define __PPC64_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* __PPC64_SEGMENT_H */