From b989638f53374c1aa496d0bcaa76528720f6d033 Mon Sep 17 00:00:00 2001
From: SecureCRT <securecrt2008@gmail.com>
Date: Thu, 23 Aug 2012 22:41:48 +0800
Subject: [PATCH] fixed merge problem

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

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 5430f578..f9a21b86 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] = {