From: Andrew Morton <akpm@linux-foundation.org>

Cc: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/namei.h |    3 ---
 1 file changed, 3 deletions(-)

diff -puN include/linux/namei.h~git-unionfs-git-rejects include/linux/namei.h
--- a/include/linux/namei.h~git-unionfs-git-rejects
+++ a/include/linux/namei.h
@@ -3,11 +3,8 @@
 
 #include <linux/dcache.h>
 #include <linux/linkage.h>
-<<<<<<< HEAD:include/linux/namei.h
 #include <linux/path.h>
-=======
 #include <linux/mount.h>
->>>>>>> FETCH_HEAD:include/linux/namei.h
 
 struct vfsmount;
 
_