From f9c1be0ea35269eb4f687cf114c5b302de7b453f Mon Sep 17 00:00:00 2001
From: securecrt <securecrt2008@gmail.com>
Date: Thu, 23 Aug 2012 13:06:34 +0800
Subject: [PATCH] fixed merge problem

---
 drivers/staging/android/lowmemorykiller.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 5430f578..5930a813 100755
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -40,14 +40,11 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
-<<<<<<< HEAD
-=======
 
 #ifdef CONFIG_SWAP
 #include <linux/fs.h>
 #include <linux/swap.h>
 #endif
->>>>>>> ics_HWA
 
 static uint32_t lowmem_debug_level = 2;
 static int lowmem_adj[6] = {
@@ -124,6 +121,8 @@ static int lmk_hotplug_callback(struct notifier_block *self,
 }
 #endif
 
+
+
 static void lowmem_notify_killzone_approach(void);
 
 static inline void get_free_ram(int *other_free, int *other_file)