jf: kernel: merge I9505GUEUDNL3

Conflicts:
	Makefile
	arch/arm/kernel/fiq.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/acpuclock-krait.c
	arch/arm/mach-msm/board-8064.h
	arch/arm/mach-msm/hotplug.c
	arch/arm/mach-msm/mdm_common.c
	arch/arm/mach-msm/timer.c
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/mmu.c
	drivers/hid/hid-logitech-dj.c
	drivers/hid/hid-picolcd.c
	drivers/media/radio/radio-iris.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/misc/qseecom.c
	drivers/sensorhub/ssp_firmware.c
	drivers/video/au1100fb.c
	drivers/video/au1200fb.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_writeback.c
	drivers/video/msm/mhl_v2/sii8240.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	firmware/ssp_rev03.fw.ihex
	fs/proc/proc_avc.c
	include/net/tcp.h
	kernel/events/core.c
	kernel/sched/core.c
	kernel/sched/sched.h
	kernel/time/timekeeping.c
	mm/vmscan.c
	net/ipv4/ping.c
	net/ipv4/syncookies.c
	net/ipv6/route.c
	net/ipv6/tcp_ipv6.c
	sound/usb/card.c

Change-Id: Ic707296afd9992a00635f7ca6b845d25dce92fa2
Merge remote-tracking branch 'korg/linux-3.4.y' into cm-12.0

Conflicts:
	drivers/bluetooth/hci_ldisc.c
	drivers/usb/dwc3/core.c
	fs/ext4/namei.c
	include/linux/sched.h
	net/wireless/nl80211.c
	sound/soc/soc-core.c

Change-Id: Ia162f89b1b76d4bd2f4fc0e3544bc63b8b0201a4
Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.7' into cm-12.0

Conflicts:
	drivers/misc/qseecom.c
	fs/proc/task_mmu.c
	include/net/addrconf.h
	include/net/tcp.h
	net/ipv4/syncookies.c
	net/ipv6/addrconf.c
	net/ipv6/ping.c
	net/ipv6/route.c
	net/ipv6/tcp_ipv6.c

Change-Id: Ic999aac4f727612f8c23089042e671f29ab2636b