commit c523abc466c9b7c693e4a528ca2f54c6e931b6a6
author Ethan Chen <intervigil@gmail.com> Fri Mar 07 11:49:08 2014 -0800
committer Ethan Chen <intervigil@gmail.com> Fri Mar 07 11:49:08 2014 -0800
tree c82c97f255a7e2411d85472ae0abb991599193da
parent 7f81e91dcddec69dc0124e0753e2ba6c1ae3b6b9
parent 9f48c5a49a9f69c98c3ead6bf820072df3f14732

Merge remote-tracking branch 'codeaurora/kk_2.7_rb1.30' into cm-11.0

Conflicts:
	arch/arm/mach-msm/acpuclock-krait.c
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/flash.c
	drivers/media/video/msm/msm_camera.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/uio/uio.c
	drivers/video/au1100fb.c
	drivers/video/au1200fb.c
	include/media/msm_isp.h
	include/media/radio-iris.h
	net/ipv4/ping.c

Change-Id: Ic027f55c9667ecccaa35ee4a96ad77dbb1e8708f