tweak ksm
mm: swaptoken only when swap full
mm: drop swap cache aggressively
mm: drop swap cache aggressively

Conflicts:
	arch/arm/boot/compressed/piggy.xzkern
msm: memory: Use standard cache routines

Conflicts:

	arch/arm/boot/compressed/piggy.xzkern

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
sched: Ensure cpu_power periodic update

Conflicts:

	arch/arm/boot/compressed/piggy.xzkern

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
sched: task_times() explosion avoidance for tasks with

Conflicts:

	arch/arm/boot/compressed/piggy.xzkern

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Fix up stale file from cherry-pick
clock wrap bug
JIT Compiler for packet filters

Conflicts:
	arch/arm/Makefile
Compile with -pipe
optimize apply_slack
Fix rq->cpu_load[] calculations
vfs: decrease cache pressure to 50 from 100
sched_fair: Improve the -> group_imb logic
OOM: fix potential killing of thread that is disabled
 Adjust VM Values

Conflicts:
	mm/vmscan.c
Import missing header from rohan.kernel.elite
Expose virtual PID from child namespace in /proc/PID/status.

The virtual PID is used by Ubuntu Touch application manager code ( which
runs in the Android namespace ), to communicate with code that runs inside the
Ubuntu container.

This patch is not from upstream.  It was proposed on the lxc-users
mailing list:

http://www.mail-archive.com/lxc-users@lists.sourceforge.net/msg01840.html

Change-Id: If63652002c227827fb524e03a1d0210fc2b7d4b1
Original-Author: Greg Kurz <gkurz@fr.ibm.com>
Signed-off-by: Greg Kurz <gkurz@fr.ibm.com>
Signed-off-by: Tony Espy <espy@canonical.com>
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
update security/