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

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

 fs/bio.c |    5 -----
 1 file changed, 5 deletions(-)

diff -puN fs/bio.c~git-block-fixup fs/bio.c
--- a/fs/bio.c~git-block-fixup
+++ a/fs/bio.c
@@ -1193,12 +1193,7 @@ static void __init biovec_init_slabs(voi
 
 static int __init init_bio(void)
 {
-<<<<<<< HEAD/fs/bio.c
 	bio_slab = KMEM_CACHE(bio, SLAB_HWCACHE_ALIGN|SLAB_PANIC);
-=======
-	bio_slab = kmem_cache_create("bio", sizeof(struct bio), 0,
-				SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
->>>>>>> /fs/bio.c
 
 	biovec_init_slabs();
 
_