Revert "net/l2tp: don't fall back on UDP [get|set]sockopt"

This reverts commit 429cdc8ab564812e8edb6552b15ed54688291222.
Sound Control: add line gain to cached and register lock

bump version to 3.6

Signed-off-by: Paul Reioux <reioux@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>
wake_gestures: re-enable proximity sensor after phone call end and screen turns off

Signed-off-by: flar2 <asegaert@gmail.com>
update defconfig

Conflicts:
	arch/arm/configs/elementalx_defconfig
backlight_dimmer: give two dimmer options and create sysfs node

Signed-off-by: flar2 <asegaert@gmail.com>
added high perfomance sound

Signed-off-by: flar2 <asegaert@gmail.com>
Bump cooker scripts

Signed-off-by: MassStash <MassStash@gmail.com>