fixed merge problem

2012-08-23 22:41:48 +08:00 · 2012-08-23 22:41:48 +08:00 · b989638f53
commit b989638f53
parent 1160ee1202
1 changed files with 0 additions and 3 deletions
--- 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] = {