Cpu quiet : lowering mp overhead
endeavoru: Update kernel zRAM configuration

Add CGROUP_MEM support to the kernel, austensibly to support zRAM.
We already have SWAP and ZRAM enabled in the kernel, so these two
lines make us match the recommendation by Google at
http://source.android.com/devices/low-ram.html

(Note that we don't currently USE zRAM, since it's not in the UI
and not in the init/fstab/et al...)
Update compat-wireless from R5.SP6.01 to R5.SP7.01

commit 1127a467ca43426d655611495e4485361a072f68
Author: Barak Schlosser <a0221150@ti.com>
Date:   Sat Dec 14 21:41:55 2013 -0800

    wl12xx: add configuration for FW to reject ADDBA frames while host is in suspend mode

commit 86f65048a09d38c6ad54b38670f7448365e4957c
Author: Barak Schlosser <a0221150@ti.com>
Date:   Sat Dec 14 21:13:26 2013 -0800

    wl12xx: don't switch channel on disconnected vifs

commit 223bb2a01b4d739b7dab543ab0037abd8e1e720b
Author: Barak Schlosser <a0221150@ti.com>
Date:   Sat Dec 14 21:25:46 2013 -0800

    wl12xx: fix arp resp template for TSN mode

commit 5ee293db62fa18d91bc2d52853dcbc7c19b91759
Author: Barak Schlosser <a0221150@ti.com>
Date:   Sat Dec 14 21:23:09 2013 -0800

    mac80211: don't allow BA session actions during reconfig

commit 27457685ffa16d55a382fa41cba55b531b54bd46
Author: Barak Schlosser <a0221150@ti.com>
Date:   Sat Dec 14 21:18:44 2013 -0800

    mac80211: remove spurious warning on recovery

Change-Id: I6e41424129ea14192df942dcc1e619d40a7dec11
Add support for kexec-hardboot

"Allows hard booting (i.e., with a full hardware reboot) to a kernel
previously loaded in memory by kexec.  This works around the problem of
soft-booted kernel hangs due to improper device shutdown and/or
reinitialization."
More info in /arch/arm/Kconfig.

Original author: Mike Kasick <mike@kasick.org>
These patches are ported from Asus TF201, to which it
was ported by Jens Andersen <jens.andersen@gmail.com>.

Change-Id: Ibee734f61ffa97577bfbcdd9a8cd567bd2d89f32
added the frandom character device http://www.billauer.co.il/frandom.html (enabled by default)
derp on frandom Kconfig
Small frandom change and adding module cleaning script.
lowmemorykiller: Compact memory when killing processes

* Memory compaction is never invoked on Android because we avoid swap
   and don't allocate huge pages. Fix it by invoking compaction from the LMK when
   a process is killed to reduce memory fragmentation.

Change-Id: I2bda790c2093e65fd6f43d52ea5149d6b57cb1e9

Conflicts:

	drivers/staging/android/lowmemorykiller.c

Conflicts:
	drivers/staging/android/lowmemorykiller.c
lowmemorykiller: Use asynchronous compaction

Change-Id: I6a65d06fc30b88fcedaaf1abf1855fdd19e3c912
random: entropy tweaks are all the rage nowadays

use nonblocking for all.  Read this web page:
http://lwn.net/Articles/489734/
cpufreq: intelliactive: initial coding and introduction!

intelliactive is based on Latest Google Interactive cpufreq governor from
Google.  The original Interactive provides smooth UI operations but suffers
slight battery drain due to its aggressive policies.  Intelliactive is an
improvement built on top of it.

It has the following enhancements added:
1. self-boost capability from input drivers (no need for PowerHAL assist)
2. two phase scheduling (idle/busy phases to prevent from jumping directly to
   max freq
3. Checks for offline cpus and short circuits some unnecessary checks to
   improve code execution paths
4. removed trace calls

Signed-off-by: Paul Reioux <reioux@gmail.com>

Conflicts:
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h
Intelliactive gov build fix
Revert "LP5521 LED: Add slow blink mode for button-backlight LED"

This reverts commit 1263173e40074df990f4d7ff9c3cbf0e9f7476d7.

Conflicts:
	drivers/leds/leds-lp5521_htc.c
Subject: [PATCH] Fix proximity sensor under low light.

From b80e9ee64cd86d88815fc721572c51c9210883ba Mon Sep 17 00:00:00 2001
From: Thomas Wendt <thoemy@gmx.net>
Date: Sat, 9 Feb 2013 16:49:48 +0100

If the ambient light is too low the proximity sensor always reports "near"
which causes the screen to be immediately turned off when starting a call.
It is not possible to turn the screen on again until the other end hangs up.
Change the proximity sensor config to fix this.

Change-Id: I5fbd338e7e04e574e287190416a485f64681a9fd
leds: Use modified led driver from enrc2b kernel

Driver contains cleanups and adds a button backlight brightness sysfs
interface.

Authors: Max Weniger and Xmister.

Commits:
  * BIG FAT warning cleanup
  * led: disabled currents for green and amber cause they do dont work correctly
  * led: added button brightness sysfs interface - thanks xmister
  * led: apply button brightness change only if on
  * led: derp - dont change backlight_mode
  * led: cleanup that log mess
  * led: another derp
  * led: limit BLN brightness to button brightness
  * led: remove HTC derp
  * leds: add custom option if slow blink brightness should be limited to button brightness - default is true
  * leds: fix currents interface

Change-Id: I47f4afa3f320abb32a9532b6c7880ea24605ae49

Conflicts:
	drivers/leds/leds-lp5521_htc.c
variant based overclocking
https://github.com/iodak/LG_X3_P880_v20a/commit/91902d5636f25b9fefe8d826f996fad613a06cbc

Conflicts:
	drivers/net/wireless/compat-wireless_R5.SP2.03/include/linux/compat_autoconf.h
voltage control, similar with faux grouper
Revert "random: entropy tweaks are all the rage nowadays"

This reverts commit 172bbee9305806c8a5009fb6ed62bacfd05a3bf7.
edp : missing declaration
Remove unneeded