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

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/slub.c |    5 -----
 1 file changed, 5 deletions(-)

diff -puN mm/slub.c~git-slub-git-rejects mm/slub.c
--- a/mm/slub.c~git-slub-git-rejects
+++ a/mm/slub.c
@@ -2716,14 +2716,9 @@ void kfree(const void *x)
 }
 EXPORT_SYMBOL(kfree);
 
-<<<<<<< HEAD:mm/slub.c
 #if defined(CONFIG_SLUB_DEBUG) || defined(CONFIG_SLABINFO)
-static unsigned long count_partial(struct kmem_cache_node *n)
-=======
-#if defined(SLUB_DEBUG) || defined(CONFIG_SLABINFO)
 static unsigned long count_partial(struct kmem_cache_node *n,
 					int (*get_count)(struct page *))
->>>>>>> FETCH_HEAD:mm/slub.c
 {
 	unsigned long flags;
 	unsigned long x = 0;
_