LGE Source 11

Conflicts:

	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/power/qpnp-charger.c