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

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

 net/802/tr.c |    7 -------
 1 file changed, 7 deletions(-)

diff -puN net/802/tr.c~git-net-fix-conflicts net/802/tr.c
--- a/net/802/tr.c~git-net-fix-conflicts
+++ a/net/802/tr.c
@@ -662,15 +662,8 @@ static __initdata struct ctl_path tr_pat
 
 static int __init rif_init(void)
 {
-<<<<<<< HEAD:net/802/tr.c
-	init_timer(&rif_timer);
-	rif_timer.expires  = jiffies + sysctl_tr_rif_timeout;
-	rif_timer.data     = 0L;
-	rif_timer.function = rif_check_expire;
-=======
 	rif_timer.expires  = sysctl_tr_rif_timeout;
 	setup_timer(&rif_timer, rif_check_expire, 0);
->>>>>>> FETCH_HEAD:net/802/tr.c
 	add_timer(&rif_timer);
 #ifdef CONFIG_SYSCTL
 	register_sysctl_paths(tr_path, tr_table);
_