Add zip template
ozip: updater-script: Correct device name
Add BFQ/SIO/FIOPS/ZEN/VR IO Schedulers

Conflicts:
	include/linux/cgroup_subsys.h

Conflicts:
	include/linux/cgroup_subsys.h
exFAT support

Signed-off-by: flar2 <asegaert@gmail.com>
msm: mdss: Adding lcd notifier

Supports notifier for start&end of LCD power on&off

Change-Id: Idaa685a2c554286da5f764519305d830c4d1a1bd
Signed-off-by: Se Hun Kim <sean2.kim@lge.com>
Signed-off-by: Jongrak Kwon <jongrak.kwon@lge.com>
Signed-off-by: Devin Kim <dojip.kim@lge.com>

Conflicts:
	drivers/video/msm/mdss/Makefile
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/Makefile

Conflicts:
	drivers/video/msm/mdss/Makefile
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/Makefile
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/Makefile

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c
lcd_notify: Only pass display state to lcd_notifer_call_chain
 - We can pass 'NULL' directly to blocking_notifier_call_chain
 - Remove unused struct 'lcd_event'

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c
PM: devfreq: Fix simple_ondemand crashing on startup

simple_ondemands private data must be set to NULL, otherwise we would
run into a NULL pointer in kgsl_devfreq_get_dev_status().

Change-Id: I6cc6a8b11e3b58b8c3e3c26d43ee36949cf62351

Signed-off-by: flar2 <asegaert@gmail.com>
touchscreen: Import Sweep2Sleep from Condor tree

 - Driver originally from @showp1984's hammerhead tree
 - Adapt definitions for Titan based on my Falcon values
 - Adapt for S2S use only
 - Adapt for Bi-Directional gestures

Conflicts:
	drivers/input/touchscreen/Makefile
input: sweep2wake: Adapt for 1920x1080 panel
input: sweep2wake: Track synaptics-rmi-ts
LCD_KCAL: Color control driver for mdss_mdp devices

/sys/devices/platform/kcal_ctrl.0/kcal
/sys/devices/platform/kcal_ctrl.0/kcal_min

kcal:
Write RGB LUT data from sysfs. Default values are '255/255/255', send
RGB info 'x x x' to kcal to apply the value and update the LUT.

kcal_min:
Lower values such as 0-10 ultimately create a dark, washed out display,
if a user accidently sets their kcal values to "0 0 0" they will loose
visual control of the device, potentially requiring a hard reboot.
Introduce minimum kcal values to prevent this behavior. kcal_min will
detect and block values attempting to set lower than itself, resetting
the specific values to that of kcal_min. There is also behavior to
adjust the kcal if kcal_min is set to a level higher than that of any
kcal value(s).

Conflicts:
	arch/arm/mach-msm/Makefile
	drivers/video/msm/mdss/Kconfig

Conflicts:
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-htc-8974.c
	drivers/video/msm/mdss/Kconfig
LCD_KCAL: Adapt LG's mdss_mdp panel invert feature

Conflicts:
	drivers/video/msm/mdss/mdss_mdp_pp.c

Conflicts:
	drivers/video/msm/mdss/mdss_mdp_pp.c
LCD_KCAL: Raise/Lower values using Sweep2Sleep gestures
LCD_KCAL: Fix incorrect refresh usage
LCD_KCAL: Fix improper bounds checking
LCD_KCAL: Adapt LG's panel invert to new MDSS doze
setlocalversion: only use first line of git show-ref

When executing the code "git show-ref -s --abbrev --tags $tag" and the
output spans multiple lines, it results in generation of a directory
in the kernel objects causing build failure.

Ex:

$ git show-ref -s --abbrev --tags LNX.LA.3.2-00520-8x26
04163f5
04163f5

Results in:

"ln: target `04163f5-00951-g2403ab9/source' is not a directory"

Fix this by pruning anything after the first line of output.

Change-Id: Iebe1e6fa88951ec0f1dab383adeb6faa72872295
Signed-off-by: Jason Hrycay <jason.hrycay@motorola.com>
scripts: setlocalversion: Do not append -g(SHA)
scripts: setlocalversion: Remove tag-specific labels
msm: mdss: enable splash logo for msm8974 devices