Merge with MK4 kernel source

Change-Id: I67b494555fe4868e0aff1565c7db2f0d435738dd

Conflicts:
	drivers/misc/Kconfig

Conflicts:
	drivers/input/touchscreen/mxts.c
	include/linux/wcnss_wlan.h