Revert "jflte: relocate sysfs interface for panel_colors"

This reverts commit 415688ae20c0d8c570b2032ba9f6a592ec265754.
Revert "panel_colors: Place code in proper files"

This reverts commit 170e2c662221c14f6b694c2fe79d22df2bc0dadc.
Revert "msm_kcal: delay late resume to be last to resume"

This reverts commit 3a19a9d53296ff7a1ed391667768ebdb59329416.
Revert "msm_kcal: add late resume drivers to autoload the lut"

This reverts commit 795d93e6f604b9a8da3fc4bf9b218e7b80a5156e.
Revert "MSM KCAL: Add generic MSK KCAL Color/Gamma Control"

This reverts commit dd27d5d6443b7ee9448eb71c29fd514a73e99b81.

Conflicts:
	arch/arm/mach-msm/Kconfig
Revert "Added sound control 3.x initial GPL release for WCD9310 Audio Codec (Thanks to Faux)"

This reverts commit 523af82617732748e4e5c4d4fcdd6ace20616ad8.

Conflicts:
	arch/arm/configs/jf_defconfig
Revert "Added faux sound control (Thanks to faux)"

This reverts commit 8b2ba1482bbced01175cd8a4ea76f7782601466f.

Conflicts:
	arch/arm/configs/jf_defconfig
logger: Add an enable toggle for entry storage (Thanks to AndreiLux)
Sound Control: Sound control for WCD93xx codec

Fully GPL'ed version.

Signed-off-by: faux123 <reioux@gmail.com>

Conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile

Conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile

Conflicts:

	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
Sound Control: Updated for HTC One (m7)

Signed-off-by: Paul Reioux <reioux@gmail.com>
Sound Control: Added headphone poweramp controls

bump version to 2.1 to reflec this new addition

Signed-off-by: Paul Reioux <reioux@gmail.com>
sound control: modified for Samsung Galaxy S4 (GT-9505 variants)

Signed-off-by: faux123 <reioux@gmail.com>
USB: dwc3: gadget: Add support for sending zero length packets

Currently driver is not honouring req->zero flag even though
function driver sets this flag. If device has to send IN data back
to host and length is multiple of endpoint maximum packet size, it
should send additional zero length packet at the end to terminate
transfer.

CRs-Fixed: 592504
Change-Id: I5a8aecc504098ed386a9a9d19f4f5b78c911a376
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
bcmdhd: decrease rx wakelock time from 500ms to 250ms for testing purposes.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
locking: Various static lock initializer fixes

The static lock initializers want to be fed the proper name of the
lock and not some random string. In mainline random strings are
obfuscating the readability of debug output, but for RT they prevent
the spinlock substitution. Fix it up.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
msm: peripheral-loader: Change IOMAP_SIZE from SZ_4M to SZ_1M

The ioremap call made for zeroing out trailing memory is currently
requesting for a 4M memory region. This is resulting in vmalloc
allocation failures on some platforms.
Instead, request for 1M memory locations and zero out the area
in smaller chunks to make this failure less probable.

CRs-Fixed: 613426

Change-Id: I554dc42cbb37ec893306bd1cc625230216b9b6c9
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
kswapd: reduce time spent in congestion_wait

By reducing the amount of time kswapd spends in
congestion_wait kswapd is able to free up more
memory in the background and therefore  reduce
the amount  of time spent in direct reclaim.

Change-Id: I46ebe577f8954d8ce9907430958fa0e53090979c
Signed-off-by: Liam Mark <lmark@codeaurora.org>
Signed-off-by: Greg Grisco <ggrisco@codeaurora.org>
cpufreq: interactive: delete timers for GOV_START

Make sure that timers cpu_timer and cpu_slack_timer
deactivated before addition of new.

Change-Id: If31c4049606871df6f00efdc24b1d713c86a6f69
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Git-commit: b430123367e78a6557bac3cf1558bcb85193fb12
Git-repo: https://android.googlesource.com/kernel/common/
[mattw@codeaurora.org: resolved trivial context conflict]
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
cpufreq: cpu-boost: Don't register for cpufreq notifiers too early

The cpufreq notifiers should be registered only after all the data
structures used in the notifier callbacks have been initialized. So, move
the cpufreq notifier registration to a later point in the init function.

Change-Id: I043ab5bc0ebb98164c40549fe151a8d801c8c186
Signed-off-by: Saravana Kannan <skannan@codeaurora.org>
New kernel released!