msm: kgsl: report gpu frequency correctly in sysfs

Signed-off-by: poondog <markj338@gmail.com>
mmc: decrease wakelock timeout

Signed-off-by: poondog <markj338@gmail.com>
suspend: shorten time to enter sleep state

Conflicts:

	kernel/power/process.c

Signed-off-by: Luis Cruz <ljc2491@gmail.com>

Conflicts:

	kernel/power/process.c
Signed-off-by: poondog <markj338@gmail.com>
ARM: 7461/1: topology: Add arch_scale_freq_power function

Add infrastructure to be able to modify the cpu_power of each core

Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Luis Cruz <ljc2491@gmail.com>
Signed-off-by: poondog <markj338@gmail.com>
fix error
ARM: 7462/1: topology: factorize the update of sibling masks

This factorization has also been proposed in another patch that has not been
merged yet:
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/080873.html
So, this patch could be dropped depending of the state of the other one.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Luis Cruz <ljc2491@gmail.com>
Signed-off-by: poondog <markj338@gmail.com>

Conflicts:
	arch/arm/kernel/topology.c
fix error
ARM: 7463/1: topology: Update cpu_power according to DT information

Use cpu compatibility field and clock-frequency field of DT to
estimate the capacity of each core of the system and to update
the cpu_power field accordingly.
This patch enables to put more running tasks on big cores than
on LITTLE ones. But this patch doesn't ensure that long running
tasks will run on big cores and short ones on LITTLE cores.

Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Luis Cruz <ljc2491@gmail.com>
Signed-off-by: poondog <markj338@gmail.com>

Conflicts:
	arch/arm/kernel/topology.c
lib/decompress_unlz4.c: always set an error return code on failures

"ret", being set to -1 early on, gets cleared by the first invocation of
lz4_decompress()/lz4_decompress_unknownoutputsize(), and hence subsequent
failures wouldn't be noticed by the caller without setting it back to -1
right after those calls.

Reported-by: Matthew Daley <mattjd@gmail.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Signed-off-by: poondog <markj338@gmail.com>
bcmdhd: tweaked wakelocks a bit

Conflicts:
	drivers/net/wireless/bcmdhd/dhd_linux.c

Change-Id: If234343ce05e5f00f8bf12628b714d547c53fe2f
[ljc: Decrease reduction.]
Signed-off-by: Luis Cruz <ljc2491@gmail.com>

[poondog: Small edits to work on BCMDHD_4335_MCC]
Signed-off-by: poondog <markj338@gmail.com>

Conflicts:
	drivers/net/wireless/bcmdhd_4335_mcc/dhd_linux.c
Revert "cpuidle: make a single register function for all"

This reverts commit c7a99ba1b64910706dbf98335c505110ff880f77.
Revert "cpuidle: remove the power_specified field in the driver"

This reverts commit 7fe2520020c41bb0fd4786586abee543a9319406.

Conflicts:
	drivers/cpuidle/cpuidle.c
fix error
Revert "cpuidle: Fix finding state with min power_usage"

This reverts commit baf97c91514e90568fc78c6f08538cf217f4ae15.

Conflicts:
	drivers/cpuidle/cpuidle.c
fix error
Revert "cpuidle: Get typical recent sleep interval"

This reverts commit f253c3e8312306d73fc685349c69ef5c4935d340.
Revert "cpuidle: Quickly notice prediction failure in general case"

This reverts commit be6e4d8a46f79c60e3313e2040f896554ef8b583.

Conflicts:
	drivers/cpuidle/governors/menu.c
fix error
Revert "cpuidle: Quickly notice prediction failure for repeat mode"

This reverts commit 7a9fbf89b9b5aad808dce2341c3c7bd94af67c8b.
Revert "cpuidle: move field disable from per-driver to per-cpu"

This reverts commit 3e8be14dde3eba8a6ee0be9fd1371812b62fc3e0.