From 0baeb4daee0eb25127ebbb6def793485bb243869 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 20 Jul 2008 10:18:44 -0700
Subject: [PATCH] --- yaml --- r: 103690 b: refs/heads/master c:
 fb65a7c091529bfffb1262515252c0d0f6241c5c h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/net/iucv/iucv.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 3acf0006a9bf..783e80c7c2f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 175f9c1bba9b825d22b142d183c9e175488b260c
+refs/heads/master: fb65a7c091529bfffb1262515252c0d0f6241c5c
diff --git a/trunk/net/iucv/iucv.c b/trunk/net/iucv/iucv.c
index a598c7384840..265b1b289a32 100644
--- a/trunk/net/iucv/iucv.c
+++ b/trunk/net/iucv/iucv.c
@@ -523,12 +523,8 @@ static int iucv_enable(void)
 	rc = -EIO;
 	get_online_cpus();
 	for_each_online_cpu(cpu)
-<<<<<<< HEAD:net/iucv/iucv.c
-		smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);
-=======
 		smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
 	preempt_enable();
->>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
 	if (cpus_empty(iucv_buffer_cpumask))
 		/* No cpu could declare an iucv buffer. */
 		goto out_path;
@@ -551,13 +547,7 @@ static int iucv_enable(void)
  */
 static void iucv_disable(void)
 {
-<<<<<<< HEAD:net/iucv/iucv.c
-	get_online_cpus();
-	on_each_cpu(iucv_retrieve_cpu, NULL, 0, 1);
-	put_online_cpus();
-=======
 	on_each_cpu(iucv_retrieve_cpu, NULL, 1);
->>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
 	kfree(iucv_path_table);
 }