From: Andrew Morton <akpm@osdl.org>

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

 drivers/cpufreq/cpufreq.c |    6 ------
 1 file changed, 6 deletions(-)

diff -puN drivers/cpufreq/cpufreq.c~git-cpufreq-fixup drivers/cpufreq/cpufreq.c
--- a/drivers/cpufreq/cpufreq.c~git-cpufreq-fixup
+++ a/drivers/cpufreq/cpufreq.c
@@ -42,14 +42,8 @@ static struct cpufreq_policy *cpufreq_cp
 static DEFINE_SPINLOCK(cpufreq_driver_lock);
 
 /* internal prototypes */
-<<<<<<< HEAD/drivers/cpufreq/cpufreq.c
 static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event);
 static void handle_update(struct work_struct *work);
-=======
-static int __cpufreq_governor(struct cpufreq_policy *policy,
-						unsigned int event);
-static void handle_update(void *data);
->>>>>>> /drivers/cpufreq/cpufreq.c
 
 /**
  * Two notifier lists: the "policy" list is involved in the
_