flo: User voltage control (faux123)

Conflicts:
	arch/arm/mach-msm/Kconfig
	drivers/cpufreq/cpufreq.c

Change-Id: Ib8916713f27896d49e64d445bffaf9c0e9820a15
Signed-off-by: flar2 <asegaert@gmail.com>
Battery life extender patch from tni.andro

Change-Id: Ib689e42a08bb27f7ab9702d36450ceaa732b710d
Signed-off-by: flar2 <asegaert@gmail.com>
battery guage enhancements from tni.andro

Conflicts:
	drivers/power/bq27541_battery.c

Change-Id: I4a3803911b5909f18525e7fde1b66341e0006b62
flo: fix mismerge after User Voltage Control



Change-Id: Ia1190829db70c27e32856449c54a606aaf91ac20
Signed-off-by: doc <doc.divxm@gmail.com>
usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs

This patch adds a "cdrom" sysfs entry for each mass_storage LUN, just
like "ro" sysfs entry. This allows switching between USB and CD-ROM
emulation without reinserting the module or recompiling the kernel.

Change-Id: Idf83c74815b1ad370428ab9d3e5503d5f7bcd3b6
flo: Linux 3.4.99

Change-Id: I448760dde5c093b6a11fa3ba0a2fa7d1e075bfd9
flo: Make 1.7 GHz the default max frequency (2nd Attempt)

Change-Id: I9b35d0bb1ff39ac0a07495eab5688680c59af8a0
Signed-off-by: RobbieL811 <robbielancaster811@gmail.com>
flo: Linux 3.4.100 - 3.4.101

Change-Id: I2023e5c8c8700988e3b1281e983be095ef344998
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: doc <doc.divxm@gmail.com>
flo: GPU Overclock: GPU overclocking to 487.5 MHz

Conflicts:
	arch/arm/mach-msm/Kconfig

Change-Id: Ib1eba8d45d458cb143b251a574fde1e33b552d49
Signed-off-by: Paul Reioux <reioux@gmail.com>
flo: GPU Overclocking: add 450 MHz option

Conflicts:
	arch/arm/mach-msm/Kconfig

Change-Id: Iadd1f002b50cf1339fc1a769d6d416c2365221ea
Signed-off-by: Paul Reioux <reioux@gmail.com>
flo: defconfig update (enable GPU Overclock)


** Linux 3.4.101 Kernel Configuration

Change-Id: I3c9b47d6b482d2091aaf07766978ced991672d81
flo: Update defconfig

Change-Id: I2e4d59e2539567caf7a6cbd89c005a1594de36e0
Signed-off-by: flar2 <asegaert@gmail.com>
Sound Control: expose direct register manipulations to userspace

bump driver version to 3.3

Change-Id: I030ea90baff52e19d01d1ade17cf94cc534ef19c
Signed-off-by: Paul Reioux <reioux@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>
Sound Control: Misc clean up for newer WCD9xxx SOCs

Bump driver version to 3.4

Change-Id: Ic3402b8ce2a5b9ca155564582f8d824a7eff1fd0
Signed-off-by: Paul Reioux <reioux@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>
Sound Control: let register lock be dependent on different hw revisions

Change-Id: Ie99c3af5df804fdbafd81330953341dce3334a02
Signed-off-by: Paul Reioux <reioux@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>
Sound Control: separate locking mechanism for recording and playback

with newer hardware revisions coming from Qualcomm, single register lock
control isn't sufficient to cover both playback and recording usage scenarios

bump to version 3.5

Change-Id: Ifa449c62ec26e88ada12f4ba11fe4bd5bb47196b
Signed-off-by: Paul Reioux <reioux@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>
flo: Forced touchscreen fw update

Conflicts:
	drivers/input/touchscreen/ektf3k.c

Change-Id: I2ef7743609504a91be24242fcb36e3d01e69a60a
Signed-off-by: flar2 <asegaert@gmail.com>
ektf3k: fix compilation warning

Conflicts:
	drivers/input/touchscreen/ektf3k.c

Change-Id: Iaafa809e0b644b795ee2c984eab9118a2eadd76f
Signed-off-by: flar2 <asegaert@gmail.com>
lz4: ensure length does not wrap

Given some pathologically compressed data, lz4 could possibly decide to
wrap a few internal variables, causing unknown things to happen.  Catch
this before the wrapping happens and abort the decompression.

Change-Id: I055b70a212d4c0f3f2ad8e57eebec6ce8aa8b4a6
Reported-by: "Don A. Bailey" <donb@securitymouse.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: flar2 <asegaert@gmail.com>
lz4: fix another possible overrun

There is one other possible overrun in the lz4 code as implemented by
Linux at this point in time (which differs from the upstream lz4
codebase, but will get synced at in a future kernel release.)  As
pointed out by Don, we also need to check the overflow in the data
itself.

While we are at it, replace the odd error return value with just a
"simple" -1 value as the return value is never used for anything other
than a basic "did this work or not" check.

Change-Id: I839144f135e2a4eb3c1fdcf1fa418ea34d481ea3
Reported-by: "Don A. Bailey" <donb@securitymouse.com>
Reported-by: Willy Tarreau <w@1wt.eu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: flar2 <asegaert@gmail.com>