-

HEAD detached from 3b9620e
You are currently cherry-picking commit 2676ca2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   arch/arm/configs/jf_defconfig
	modified:   arch/arm/mach-msm/Kconfig
	modified:   arch/arm/mach-msm/bam_dmux.c
	modified:   build-all.py
	modified:   drivers/base/firmware_class.c
	modified:   drivers/bluetooth/bluesleep.c
	modified:   drivers/char/diag/Kconfig
	modified:   drivers/gpu/msm/adreno.c
	modified:   drivers/gpu/msm/adreno.h
	modified:   drivers/gpu/msm/adreno_postmortem.c
	modified:   drivers/gpu/msm/z180.c
	modified:   drivers/input/touchscreen/rmi_fw_update.c
	modified:   drivers/media/radio/radio-iris.c
	modified:   drivers/net/wireless/bcmdhd/Makefile
	modified:   drivers/net/wireless/bcmdhd/wl_cfg80211.c
	modified:   drivers/sensorhub/ssp.h
	modified:   drivers/sensorhub/ssp_data.c
	modified:   drivers/sensorhub/ssp_dev.c
	modified:   drivers/sensorhub/ssp_firmware.c
	modified:   drivers/sensorhub/ssp_input.c
	modified:   drivers/sensorhub/ssp_sysfs.c
	modified:   drivers/tty/serial/msm_serial_hs.c
	modified:   drivers/usb/gadget/u_serial.c
	modified:   drivers/video/msm/mdp.h
	modified:   drivers/video/msm/mdp4_util.c
	modified:   drivers/video/msm/mhl_v2/sii8240.c
	modified:   drivers/video/msm/mhl_v2/sii8240_driver.h
	modified:   drivers/video/msm/mipi_dsi.c
	modified:   drivers/video/msm/mipi_dsi.h
	modified:   drivers/video/msm/mipi_dsi_host.c
	modified:   drivers/video/msm/mipi_samsung_octa.c
	modified:   drivers/video/msm/msm_dss_io_8960.c
	modified:   drivers/video/msm/msm_fb.h
	modified:   drivers/video/msm/msm_fb_panel.c
	modified:   drivers/video/msm/msm_fb_panel.h
	modified:   firmware/ssp_rev03.fw.ihex
	modified:   fs/proc/proc_avc.c
	modified:   include/linux/ipv6.h
	modified:   include/linux/time.h
	modified:   kernel/auditsc.c
	modified:   kernel/cgroup.c
	modified:   kernel/power/wakelock.c
	modified:   kernel/time.c
	modified:   net/bluetooth/hci_core.c
	modified:   net/ipv4/icmp.c
	modified:   net/ipv4/syncookies.c
	modified:   net/ipv6/sysctl_net_ipv6.c
	modified:   net/netfilter/x_tables.c
	deleted:    scripts/basic/fixdep
	deleted:    scripts/bin2c
	deleted:    scripts/conmakehash
	deleted:    scripts/genksyms/genksyms
	deleted:    scripts/genksyms/keywords.hash.c
	deleted:    scripts/genksyms/lex.lex.c
	deleted:    scripts/genksyms/parse.tab.c
	deleted:    scripts/genksyms/parse.tab.h
	deleted:    scripts/kallsyms
	deleted:    scripts/kconfig/conf
	deleted:    scripts/kconfig/zconf.hash.c
	deleted:    scripts/kconfig/zconf.lex.c
	deleted:    scripts/kconfig/zconf.tab.c
	deleted:    scripts/mod/elfconfig.h
	deleted:    scripts/mod/mk_elfconfig
	deleted:    scripts/mod/modpost
	deleted:    scripts/selinux/genheaders/genheaders
	deleted:    scripts/selinux/mdp/mdp

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:      include/net/addrconf.h
	both modified:      net/ipv6/addrconf.c
	both modified:      net/ipv6/ping.c