Disabled perflock / fixed interactive
removed "+" from localversion
Added Qualcomm ROW I/O Scheduler
Finishing import of Qualcomm ROW I/O Scheduler.
Updating new cortex makefile flags
Added FIOPS Scheduler.

FIOPS (Fair IOPS) ioscheduler is an IOPS based ioscheduler, so it only targets
for drives without I/O seek. It's quite similar to CFQ, but the dispatch
decision is made according to IOPS instead of slice.

The algorithm is simple. The drive has a service tree, and each task lives in
the tree. The key into the tree is called vios (virtual I/O). Every request
has vios, which is calculated according to its ioprio, request size and so
on. Task's vios is the sum of vios of all requests it dispatches. FIOPS
always selects task with minimum vios in the service tree and lets the task
dispatch requests. The dispatched request's vios is then added to the task's
vios and the task is repositioned in the sevice tree.

Unlike CFQ, FIOPS doesn't have separate sync/async queues, because with I/O
less writeback, usually a task can only dispatch either sync or async requests.
Bias read or write request can still be done with read/write scale.

One issue is if workload iodepth is lower than drive queue_depth, IOPS
share of a task might not be strictly according to its priority, request
size and so on. In this case, the drive is in idle actually. I believe
CFQ isn't completely fair between tasks in such cases either.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
ARM: 7011/1: Add ARM cpu topology definition

The affinity between ARM processors is defined in the MPIDR register.
We can identify which processors are in the same cluster,
and which ones have performance interdependency. We can define the
cpu topology of ARM platform, that is then used by sched_mc and sched_smt.

The default state of sched_mc and sched_smt config is disable.
When enabled, the behavior of the scheduler can be modified with
sched_mc_power_savings and sched_smt_power_savings sysfs interfaces.

Changes since v4 :
*  Remove unnecessary parentheses and blank lines

Changes since v3 :
* Update the format of printk message
* Remove blank line

Changes since v2 :
* Update the commit message and some comments

Changes since v1 :
* Update the commit message
* Add read_cpuid_mpidr in arch/arm/include/asm/cputype.h
* Modify header of arch/arm/kernel/topology.c
* Modify tests and manipulation of MPIDR's bitfields
* Modify the place and dependancy of the config
* Modify Noop functions

Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
	arch/arm/configs/beastmode_defconfig
	drivers/staging/comedi/drivers/sedlcqrcB
	sound/pci/hda/sedaZWceY
switch do_fsync() to fget_light()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/dyn_sync_cntrl: dynamic sync control

The dynamic sync control interface uses Android kernel's unique early
suspend / late resume interface.

While screen is on, file sync is disabled
when screen is off, a file sync is called to flush all outstanding writes
and restore file sync operation as normal.

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

This cherry-pick also include the following commit:
https://github.com/faux123/mako/commit/7724038ee75d0c4f51b10a0cda7aa00f63b61711
Added Force Fast Charge -

Original code by chad0989
sweep2wake: added with /sys

sweep2wake code by showp1984
sysfs code by Chad Goodman
ported to DNA by Zarboz

 Author:    showp1984 <showp1984@gmail.com>
Added ThermalD /sys entry.
Fix Sweep2Wake in call touchscreen issue.
arm/crypto: Add optimized AES and SHA1 routines

Add assembler versions of AES and SHA1 for ARM platforms.  This has provided
up to a 50% improvement in IPsec/TCP throughout for tunnels using AES128/SHA1.

Platform   CPU SPeed    Endian   Before (bps)   After (bps)   Improvement

IXP425      533 MHz      big     11217042        15566294        ~38%
KS8695      166 MHz     little    3828549         5795373        ~51%

Signed-off-by: David McCullough <ucdevel@gmail.com>
Signed-off-by: faux123 <reioux@gmail.com>
Voltage Control: initial voltage control for MSM S4-Pro SOC

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

This cherry-pick also includes:
https://github.com/faux123/mako/commit/1325f214b0c878929c79a739616aa7f178ea6c55
msm_hsic: decrease timeout duration in detecting stuck PHY during suspend

from 500ms to 120ms

Signed-off-by: faux123 <reioux@gmail.com>
Added Intellidemand Gov.
cpupower: update the cpu_power according to cpu load
LOAD_FREQ (4*HZ+61) avoids loadavg Moire

By Klaus Ripke

https://lkml.org/lkml/2011/11/12/39