Fix mismerge of 3.0.21 patch

 * Android-specific changes got stomped, causing OOM very quickly.

Change-Id: I88af068b666e27ec37bddb9cbf661bec2072ca16
d2: Disable Samsung MTP mode

Change-Id: Ic8bcf9217639b9e2e1c84b1b3898c3884fa2da69
d2: Enable RAW tables for Netfilter

 * Needed by bandwidth control / accounting in 4.1

Change-Id: I3e444141ab29d75db61c9d1af4be120bde925882
d2: Enable tracers, regenerate defconfig

Change-Id: If02cda347dc50ec44b99c86764a39014c9dc3e3a
Linux 3.0.38
d2: att: fix sensor and merge kexec support

merge d2 changes to vzw and spr

Change-Id: I61cd9f08b9661b1df2f4f228495891acf3a8670d
msm: rotator: Add secure session flag to rotator start data

Add flag for handling secure session to rotator data passed during
start ioctl call.

Change-Id: I58e2107dfc5c9956691a3defa7364fc220cfe079
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
d2att: Move ramconsole to lower memory

Change-Id: Ie9903a97014d639a2ab623d6f965f9db56d5b9ac
Linux 3.0.39
sched/nohz: Correctly initialize 'next_balance' in 'nohz' idle balancer

The 'next_balance' field of 'nohz' idle balancer must be initialized
to jiffies. Since jiffies is initialized to negative 300 seconds the
'nohz' idle balancer does not run for the first 300s (5mins) after
bootup. If no new processes are spawed or no idle cycles happen, the
load on the cpus will remain unbalanced for that duration.

Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1DD7BFEDD3147247B1355BEFEFE4665237994F30EF@HQMAIL04.nvidia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

[xqi@codeaurora.org merge into different file location in 3.0]
Change-Id: I42c41210babb0881150d28d11c2d3fce24fe3a9f
Signed-off-by: Xin Qi <xqi@codeaurora.org>
sched/nohz: Fix logic in nohz_kick_needed

Update the logic so that as long as rq->nr_running is greater than 1,
nohz_kick will be needed, regardless of whether the current CPU has
successfully competed for the first or second cpu spot

Previous logic has the corner case that if current CPU has r_running more than
1, and two other CPUs alreay hold first and econd cpu spot, but they don't
meeting kicking criterial (first cpu has nr_running 1, and second cpu doesn't
have any load), then nohz_kick will not be set correctly.

Change-Id: I30790f22df0a2e90899daa44c67757284dcca25d
Signed-off-by: Xin Qi <xqi@codeaurora.org>
sched/nohz: Fix logic in run_rebalance_domains

If triggered by nohz_balancer_kick, idle_at_tick is not updated
accordingly.  Update myself at this moment right before it is used

Change-Id: I20dd4314159e70f955ffe482160c8867c65c261e
Signed-off-by: Xin Qi <xqi@codeaurora.org>
sched/nohz: Fix logic in trigger_load_balance

Whether we need to kick nohz doesn't depend on current rq->next_balance,
meaning it doesn't depend on the check of previous if condition.

Change-Id: I566011d6341fa7a9a700c834f77e129043eaba11
Signed-off-by: Xin Qi <xqi@codeaurora.org>
ram_console: set CON_ANYTIME console flag

We want to ensure that we get all the console messages, even ones
that occur while the printing CPU is not yet online.

Change-Id: I1d2694d05ac9415669a92f38efdd8e71c927705b
Signed-off-by: Dima Zavin <dima@android.com>
d2: Disable the verbose ramconsole printks

 * Although this is really nice, it's introducing some nasty latency
   into the kernel. It's easily seen by typing quickly on the soft
   keyboard with haptics enabled. Haptics will often fire at 2x or 3x
   the duration.

Change-Id: I6b294da1c53eee130f3c0ea3688a14aee496cba7
d2: Update defconfig

 * Enable FAIR_GROUP_SCHED

Change-Id: I7a6f96e2f84c58b3fa8835ceaa81e6fa8dbf2682
Merge d2spr LG8 source release.

Conflicts (reverted to previous):
	arch/arm/configs/m2_vzw_defconfig
	arch/arm/configs/m2_vzw_eng_defconfig

Change-Id: I70859dd9aeffffc4392a881ba5af476b8bffe076

Conflicts(reverted to previous patch):
	drivers/base/genlock.c
	drivers/gpu/ion/ion_cp_heap.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
vidc: Migrate to ion_map_iommu() API.

Migrate video driver to use the ion_map_iommu() api,
this api provides the physical address if IOMMU is
not enabled.
If IOMMU is enabled in the system it provides the
virtual contigious address.

Change-Id: I0f6f7c50865cb3da88a0ee13425e3973037c846a
Signed-off-by: Arun Menon <menon@codeaurora.org>

Conflicts:

	drivers/video/msm/vidc/common/dec/vdec.c
vidc: Move shared memory to firmware heap

if smmu is enabled then the memory needs to be
mapped as cached for IOMMU heap, moving the
shared mmeory to firmware heap which does not
require cached mapping

Change-Id: Iac14169b1063bd2784ebf7df433614d68830e84a
Signed-off-by: Arun Menon <menon@codeaurora.org>
vidc: Move metadata shared input mem to firmware heap.

Metadata shared input is used to communicate between
the video code and video driver, hence make this buffer
as uncached and allocate it from firmware heap.

Change-Id: Iabcf6fdbdf6ebcae2fef60b9163a3dfa862624f6
Signed-off-by: Arun Menon <menon@codeaurora.org>