Merge tag 'LNX.LA.2.7-06510-8064.0' of git://codeaurora.org/quic/la/kernel/msm into HEAD

"LNX.LA.2.7-06510-8064.0"

Conflicts:
	arch/arm/mm/init.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	net/ipv4/ping.c
	net/ipv6/ping.c

Change-Id: I36d5840fc21e19d2867fa2a86800e6b3c6a1d9f1