Revert "cfg80211: add flags to define country IE processing rules"

This reverts commit 6aec9502c3bd1ceb8e02bafedc17a620db64c325.
Linux 3.4.1 -> 3.4.74

Conflicts:
	net/ipv4/syncookies.c
	net/ipv6/tcp_ipv6.c
Linux 3.4.75 -> 3.4.95
Revert "Revert "cfg80211: add flags to define country IE processing rules""

This reverts commit 14968c2cc0f445c4822ba714aaf4c85b7b69b1d4.

Conflicts:
	net/wireless/reg.c
tick-sched: revert to unlikely check for ts->nohz_mode == NOHZ_MODE_INACTIVE
msm_thermal: Import driver from jb422 branch
msm: kgsl: report gpu frequency correctly in sysfs
mako LCD: keep RGB custom colors alive after screen off/on

When the back-light turns back on, reset the RGB values set in
sysfs (/sys/devices/platform/kcal_ctrl.0/kcal)
Support for faux123 gamma control
LG Mako gamma control - add mirror interface while leaving
faux's interface in place, respecting his rollover char checksum.

Mirror interface should be a little easier for humans to work
with from scripting (int checksum that doesn't roll over).

Added a couple validation checks to both interfaces before allowing
values to be stored. This will add some safety for scripting or rouge
apps that may have a bug.
-Only allow gamma amp 0 and 1 values up to 31.
-Since we are pushing to a char data type, make sure nothing is over
255.

Changed dsi_cmd_desc struct name so it can be shared between
both interfaces.

Added to sysfs:
/sys/devices/platform/mipi_lgit.1537/kgamma_red
/sys/devices/platform/mipi_lgit.1537/kgamma_green
/sys/devices/platform/mipi_lgit.1537/kgamma_blue

Example:
echo "383 114 21 118 0 0 0 80 48 2" >
/sys/devices/platform/mipi_lgit.1537/kgamma_red

echo "383 114 21 118 0 0 0 80 48 2" >
/sys/devices/platform/mipi_lgit.1537/kgamma_green

echo "383 114 21 118 0 0 0 80 48 2" >
/sys/devices/platform/mipi_lgit.1537/kgamma_blue

First digit is a checksum (sum of all the other 9 numbers)
Gamma Amp 0 = value 6
Gamma Amp 1 = value 7

Show the current settings with proper checksum:
cat /sys/devices/platform/mipi_lgit.1537/kgamma_red
cat /sys/devices/platform/mipi_lgit.1537/kgamma_green
cat /sys/devices/platform/mipi_lgit.1537/kgamma_blue
Gamma Control - added refresh_screen sysfs attribute that has nothing to
do with setting values. This should only be called by apps or scripts
while adjusting colors "live" with the motley or faux interface and not
implemented on startup via init.d or apps since it will compete with the
normal power on process.

echo 1 > /sys/devices/platform/mipi_lgit.1537/refresh_screen
Conflicts:
	scripts/gcc-wrapper.py
Linaro 4.8 fixes

Conflicts:
	drivers/usb/gadget/f_qdss.c
	net/bluetooth/hci_conn.c
Added Linaro 4.8.2 Fixes
msm: gpu: add optimization flags to GPU drivers

thanks to
@Lens-F
video: msm_fb: reduce logging level.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
thermal: tsens8960: Increase the polling rate

Change the polling rate at which the sensors temperature
is read from 1 second to .25 seconds. On faster parts
there is a need to poll the temperature at a higher
frequency to improve reporting temperature changes.

Change-Id: I10049707c3e55316597fff72fbd00246cd29bed3
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
Use pgprot_writecombine in ion_system_heap_map_kernel for optimization.
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
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/soc/codecs/wcd9310.c: expose additional controls

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