net: missing addr_len parameter
intelli_plug: Manually update to @faux123 2.2, this must be done to keep strict mode working properly
Sound Control: WCD9320: expose additional controls

Signed-off-by: Paul Reioux <reioux@gmail.com>
Add Sound Control 3

Conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
Sound Control: (Optional) work around for Nexus 4/5 audio issues

(Use this only for devices with audio reset issues)

Also bump version to 3.1

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

wcd9xxx-core: add register write without mutex protection

This is assuming the calling function will take care of the mutex.

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

Conflicts:
	include/linux/mfd/wcd9xxx/core.h
	sound/soc/codecs/wcd9320.c
snd: adapt sound_control for newer wcd9230 codecs
Sound Control: (OPTIONAL) add power amp registers access control as well

Signed-off-by: Paul Reioux <reioux@gmail.com>
sound control: add register cache

bump to version 3.2

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

Conflicts:
	sound/soc/codecs/wcd9320.c
dts: thermal changes

Ease up on thermal throttling and use correct thermal frequency
drivers: thermal: Import intelli_thermal by @faux123 and adapt for g2
Revert "sound control: add register cache"

This reverts commit 25f7e15c5859dac4ed5d9d6fe5c9a74cc1c69830.
Revert "Sound Control: (OPTIONAL) add power amp registers access control as well"

This reverts commit c9853d6627ff1a5cb71418f18e06ea02650cb2af.
Revert "snd: adapt sound_control for newer wcd9230 codecs"

This reverts commit 7923b6bbd39b3fdbbb70c4d95e26c0b5c4e4f74a.
Revert "Sound Control: (Optional) work around for Nexus 4/5 audio issues"

This reverts commit af1da388645abcdc1194d6b328c9157133aff913.
Revert "Add Sound Control 3"

This reverts commit fc08b6dfbaccb2ec9ad159831e3dc74998a65d71.
Revert "Sound Control: WCD9320: expose additional controls"

This reverts commit d5d4c393c4eb92bd853832851ad9076b68fc4001.
Merge remote-tracking branch 'fa/master'

Conflicts:
	arch/arm/mach-msm/intelli_plug.c
Furnace 2.0.1 + update
warning: multi-line strings not supported
Add vs980 ramdisk