cpuquiet: balanced as default gov
Added CPU gov "ABYSSPLUG"

Conflicts:
	arch/arm/configs/cyanogenmod_x3_defconfig
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h
Added CPU gov "LULZACTIVE"

Conflicts:
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h
Added COU gov "N3OCOLD

Conflicts:
	drivers/cpufreq/Kconfig
	include/linux/cpufreq.h
Added CPU gov "PEGASUSQ"

Conflicts:
	drivers/cpufreq/Kconfig
	include/linux/cpufreq.h
Added CPU gov "SMARTASS"

Conflicts:
	drivers/cpufreq/Kconfig
	include/linux/cpufreq.h
Added CPU gov "TOUCHDEMAND"

Conflicts:
	arch/arm/configs/cyanogenmod_x3_defconfig
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h
tegra: add GPU clocks interface.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>

Conflicts:
	arch/arm/mach-tegra/common.c
	drivers/cpufreq/cpufreq.c

Conflicts:
	arch/arm/mach-tegra/common.c
	drivers/cpufreq/cpufreq.c
cpufreq.c: add userspace voltage control. Original implementation from faux123 (which was based on Michael Huang's OMAP4460 work). Interface cleaned up, made more robust and secure

Conflicts:
	drivers/cpufreq/cpufreq.c

Conflicts:
	drivers/cpufreq/cpufreq.c
Revert "cpufreq.c: add userspace voltage control. Original implementation from faux123 (which was based on Michael Huang's OMAP4460 work). Interface cleaned up, made more robust and secure"

This reverts commit 22a294fa6d90a944517a559e1bbc3e5fdd66ab97.

Conflicts:
	drivers/cpufreq/cpufreq.c
Revert "tegra: add GPU clocks interface."

This reverts commit 713f9db2e96c24710ac1f1ddb14e098f0c37abc0.

Conflicts:
	drivers/cpufreq/cpufreq.c
Revert "tegra: add GPU clocks interface."

This reverts commit 713f9db2e96c24710ac1f1ddb14e098f0c37abc0.

Conflicts:
	drivers/cpufreq/cpufreq.c
Added BFQ and SIO I/O Scheduler

Add the BFQ-v6r2 I/O scheduler to 3.1.
The general structure is borrowed from CFQ, as much code. A (bfq_)queue
is
associated to each task doing I/O on a device, and each time a
scheduling
decision has to be made a queue is selected and served until it expires.

Conflicts:
	include/linux/cgroup_subsys.h