netfilter: xt_log.h: fix warning: value computed is not used
drivers: input: cy8c_tma_ts: properly fix touchscreen issues. (HTC)
kgsl: 3D: increase bandwidth to avoid bottlenecking the gpu
kgsl: 2D: increase bandwidth to avoid bottlenecking the gpu
Revert "kgsl: increase max allowed power levels"

This reverts commit 236b090fed5f82054feada81b1e21ba63655cfc9.
kgsl: eliminate not used scaling steps
msm: deactivate notification led timeout
acpu: slightly push voltages above 1566 to make it more oc happy
acpu/avs: push POSSIBLE max voltage, wider scaling range for the user
msm: kgsl: add GPUOC config variable
Make vfs_cache_pressure configurable
sched: disable GENTLTE_FAIR_SLEEPERS for better performance on Android
Add LagFree CPU Governor
sched: Cleanup pre_schedule_rt

From: Yong Zhang <yong.zhang0@gmail.com>
Date: Tue, 9 Feb 2010 19:43:59 +0000 (-0500)
Subject: sched: Cleanup pre_schedule_rt
X-Git-Tag: v3.1-rc1~298^2~19^2~3
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=33c3d6c61debcc0d295fe65521cfbc45409936c7

Since [commit 9a897c5a:
sched: RT-balance, replace hooks with pre/post schedule and wakeup methods]
we must call pre_schedule_rt if prev is rt task.
So condition rt_task(prev) is always true and the 'unlikely' declaration is
simply incorrect.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
sched: Change pick_next_task_rt from unlikely to likely

From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 6 Dec 2010 16:28:30 +0000 (-0500)
Subject: sched: Change pick_next_task_rt from unlikely to likely
X-Git-Tag: v3.1-rc1~298^2~19^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8e54a2c036d8c47195f094af1628834f4c55844a

The if (unlikely(!rt_rq->rt_nr_running)) test in pick_next_task_rt()
tests if there is another rt task ready to run. If so, then pick it.

In most systems, only one RT task runs at a time most of the time.
Running the branch unlikely annotator profiler on a system doing average
work "running firefox, evolution, xchat, distcc builds, etc", it showed the
following:

 correct incorrect  %        Function                  File              Line
 ------- ---------  -        --------                  ----              ----
  324344 135104992  99 _pick_next_task_rt             sched_rt.c           1064

99% of the time the condition is true. When an RT task schedules out,
it is unlikely that another RT task is waiting to run on that same run queue.

Simply remove the unlikely() condition.

Acked-by: Gregory Haskins <ghaskins@novell.com>
Cc:Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
sched: Remove unlikely() from rt_policy() in sched.c

From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 6 Dec 2010 19:48:10 +0000 (-0500)
Subject: sched: Remove unlikely() from rt_policy() in sched.c
X-Git-Tag: v3.1-rc1~298^2~19^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=63f01241176d7cbc976385aec32f0a209b0bc36a

The rt_policy() has an unlikely() that the policy it is checking is
of RT priority (SCHED_FIFO or SCHED_RR).

According to the annotate branch profiler it is incorrect most of the time:

 correct incorrect  %        Function                  File              Line
 ------- ---------  -        --------                  ----              ----
   36667   654674  94 rt_policy                      sched.c              126

This makes sense because the rt_policy() is used by the sched_set_scheduler()
and nice(). Although users may use sys_nice a bit, all RT users use
the sched_set_scheduler() to set their RT priority, including kernel
threads.

The above numbers were from a normal desktop computer running
firefox, evolution, xchat and was part of a distcc compile farm.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
sched: Remove unlikely() from ttwu_post_activation

From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 6 Dec 2010 22:10:31 +0000 (-0500)
Subject: sched: Remove unlikely() from ttwu_post_activation
X-Git-Tag: v3.1-rc1~298^2~19^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e69c634190dc724ef2d845ace8d783031d3e492e

The unlikely() used in ttwu_post_activation() tests if the rq->idle_stamp
is set. But since this is for a wakeup, and wakeups happen when tasks
block on IO, and blocking tasks on IO may put the system into idle,
this can actually be a common occurence.

Running the annotated branch profiler on an average desktop running
firefox, evolution, xchat and distcc, the report shows:

 correct incorrect  %        Function             File              Line
 ------- ---------  -        --------             ----              ----
34884862 146110926  80 ttwu_post_activation      sched.c            2309

80% of the time, this unlikely is incorrect. Best not to assume what the
result is, and just remove the branch annotation.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
ARM: entry: no need to increase preempt count for IRQ handlers

From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 25 Jun 2011 09:57:57 +0000 (+0100)
Subject: ARM: entry: no need to increase preempt count for IRQ handlers
X-Git-Tag: v3.1-rc1~258^2~1^3~16
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1613cc1119ecdb1bdb950da53065e615e4c4b8db

irq_enter() and irq_exit() already take care of the preempt_count
handling for interrupts, which increment and decrement the hardirq
bits of the preempt count.  So we can remove the preempt count handing
in our IRQ entry/exit assembly, like x86 did some 9 years ago.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
governor: Added CPUfreq governor 'lazy'

From 869cd93f9f8f0159e5e266a5d1b5df9a97f9615a Mon Sep 17 00:00:00 2001
From: Ezekeel <notezekeel@googlemail.com>
Date: Sat, 17 Dec 2011 07:21:14 +0100
Subject: [PATCH] Added CPUfreq governor 'lazy'.

Conflicts:

	drivers/cpufreq/Kconfig
base: genlock: Remove genlock_release_lock and associated ioctl

Allowing a lock to be asynchronously released while a handle
was still active turned out to be too dangerous to use in a
multi-threaded environment and it served no pratical
purpose anyway.  Handles now hold an attached lock until they
are destroyed.

CRs-fixed: 333141
Change-Id: Ic0dedbad8050ff01927ddb165c65a939bf297c10
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>