Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-new
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-new
Copy audio_effects.h to userspace

Change-Id: Idce1c1e51b80ae58cfd663376a41cb37a0649f5b
net/l2tp: don't fall back on UDP [get|set]sockopt

The l2tp [get|set]sockopt() code has fallen back to the UDP functions
for socket option levels != SOL_PPPOL2TP since day one, but that has
never actually worked, since the l2tp socket isn't an inet socket.

As David Miller points out:

  "If we wanted this to work, it'd have to look up the tunnel and then
   use tunnel->sk, but I wonder how useful that would be"

Since this can never have worked so nobody could possibly have depended
on that functionality, just remove the broken code and return -EINVAL.

Reported-by: Sasha Levin <sasha.levin@oracle.com>
Acked-by: James Chapman <jchapman@katalix.com>
Acked-by: David Miller <davem@davemloft.net>
Cc: Phil Turnbull <phil.turnbull@oracle.com>
Cc: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Willy Tarreau <w@1wt.eu>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: Ia6c09487e92d1ee4e8d1d22a6273034b22272a2f
misc: Clean up warnings about uninitialized variables

Change-Id: I2d928cb3ab42d1283c14d873adec29fcc262f265
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-new
LCD_KCAL: Color Control driver for Moto G
LCD_KCAL: porting to Xperia Z1 (part 2)

Conflicts:
	arch/arm/mach-msm/board-8974.c

Change-Id: I6f7f1137fc3e274d5d60f0e5319ad3b7b813d79d

Conflicts:
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-8974.c
	drivers/video/msm/mdss/Kconfig
defconfig :enable LCD_KCAL
Fix merge derps

Change-Id: Ibee698733d26dceead9765104532aaf3b6b4b9b1
fix derps
Merge branch 'cm-11.0-new' into cm-11.0-ip