-

On branch aosp
Your branch is up-to-date with 'github/cm-11.0'.

You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

	modified:   Documentation/ABI/testing/sysfs-devices-power
	modified:   Documentation/ABI/testing/sysfs-power
	modified:   Documentation/kernel-parameters.txt
	modified:   Documentation/power/suspend-and-cpuhotplug.txt
	new file:   Documentation/sync.txt
	modified:   Documentation/trace/ftrace.txt
	modified:   arch/arm/Kconfig
	modified:   arch/arm/Makefile
	modified:   arch/arm/boot/.gitignore
	modified:   arch/arm/boot/Makefile
	modified:   arch/arm/common/fiq_debugger.c
	modified:   arch/arm/include/asm/mmu.h
	modified:   arch/arm/include/asm/sched_clock.h
	modified:   drivers/base/power/sysfs.c
	modified:   drivers/base/sw_sync.c
	modified:   drivers/cpuidle/Kconfig
	modified:   drivers/cpuidle/Makefile
	new file:   drivers/cpuidle/coupled.c
	modified:   drivers/cpuidle/cpuidle.c
	modified:   drivers/cpuidle/cpuidle.h
	new file:   drivers/gpu/ion/ion_chunk_heap.c
	new file:   drivers/gpu/ion/ion_page_pool.c
	modified:   drivers/hid/hid-debug.c
	modified:   drivers/hid/hid-input.c
	modified:   drivers/input/misc/keychord.c
	modified:   drivers/leds/led-triggers.c
	modified:   drivers/net/wireless/bcmdhd/Kconfig
	deleted:    drivers/net/wireless/bcmdhd/bcmwifi_channels.h
	deleted:    drivers/net/wireless/bcmdhd/bcmwifi_rates.h
	new file:   drivers/net/wireless/bcmdhd/common/include/proto/802.11.h
	renamed:    drivers/net/wireless/bcmdhd/include/proto/802.1d.h -> drivers/net/wireless/bcmdhd/common/include/proto/802.1d.h
	new file:   drivers/net/wireless/bcmdhd/common/include/proto/bcmevent.h
	new file:   drivers/net/wireless/bcmdhd/common/include/proto/ethernet.h
	new file:   drivers/net/wireless/bcmdhd/common/include/proto/p2p.h
	renamed:    drivers/net/wireless/bcmdhd/include/proto/vlan.h -> drivers/net/wireless/bcmdhd/common/include/proto/vlan.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/802.11e.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/bcmeth.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/bcmip.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/eapol.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/sdspi.h
	deleted:    drivers/net/wireless/bcmdhd/include/proto/wpa.h
	modified:   drivers/power/power_supply_core.c
	modified:   drivers/power/power_supply_sysfs.c
	modified:   drivers/power/smb347-charger.c
	modified:   drivers/staging/android/ram_console.c
	modified:   drivers/staging/iio/industrialio-event.c
	modified:   drivers/w1/masters/ds2482.c
	modified:   fs/ext4/ext4.h
	modified:   fs/ext4/ialloc.c
	modified:   fs/ext4/ioctl.c
	modified:   fs/ext4/mballoc.c
	modified:   include/linux/android_aid.h
	modified:   include/linux/cpuidle.h
	modified:   include/linux/fs.h
	new file:   include/linux/platform_data/ds2482.h
	modified:   include/linux/power/smb347-charger.h
	modified:   include/linux/power_supply.h
	modified:   include/linux/suspend.h
	modified:   include/linux/sync.h
	new file:   include/linux/wakeup_reason.h
	modified:   include/sound/soc-dapm.h
	new file:   include/trace/events/gpu.h
	new file:   kernel/power/autosleep.c
	modified:   kernel/power/hibernate.c
	deleted:    kernel/power/userwakelock.c
	new file:   kernel/power/wakeup_reason.c
	modified:   kernel/trace/Kconfig
	modified:   kernel/trace/Makefile
	new file:   kernel/trace/gpu-traces.c
	modified:   kernel/trace/trace.c
	modified:   kernel/trace/trace.h
	modified:   kernel/trace/trace_functions_graph.c
	modified:   kernel/trace/trace_output.c
	modified:   mm/vmscan.c
	modified:   net/bluetooth/af_bluetooth.c
	modified:   net/netfilter/xt_qtaguid.c
	modified:   scripts/Makefile.lib

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

	both modified:      Documentation/networking/ip-sysctl.txt
	both added:         android/configs/android-base.cfg
	both added:         android/configs/android-recommended.cfg
	both modified:      arch/arm/boot/compressed/head.S
	both modified:      arch/arm/include/asm/mmu_context.h
	both modified:      arch/arm/include/asm/thread_info.h
	both modified:      arch/arm/kernel/sched_clock.c
	both modified:      arch/arm/mm/context.c
	both modified:      arch/arm/mm/proc-v7-2level.S
	both modified:      arch/arm/vfp/entry.S
	both modified:      drivers/base/power/main.c
	both modified:      drivers/base/power/wakeup.c
	both modified:      drivers/base/sync.c
	both modified:      drivers/cpufreq/cpufreq_interactive.c
	both modified:      drivers/gpu/ion/Makefile
	both modified:      drivers/gpu/ion/ion.c
	both modified:      drivers/gpu/ion/ion_carveout_heap.c
	both added:         drivers/gpu/ion/ion_cma_heap.c
	both modified:      drivers/gpu/ion/ion_heap.c
	both modified:      drivers/gpu/ion/ion_priv.h
	both modified:      drivers/gpu/ion/ion_system_heap.c
	both modified:      drivers/mmc/card/block.c
	both modified:      drivers/mmc/core/core.c
	both modified:      drivers/mmc/core/sdio.c
	both modified:      drivers/net/wireless/bcmdhd/Makefile
	both modified:      drivers/net/wireless/bcmdhd/aiutils.c
	both modified:      drivers/net/wireless/bcmdhd/bcmevent.c
	both modified:      drivers/net/wireless/bcmdhd/bcmsdh.c
	both modified:      drivers/net/wireless/bcmdhd/bcmsdh_linux.c
	both modified:      drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	both modified:      drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	both modified:      drivers/net/wireless/bcmdhd/bcmutils.c
	both modified:      drivers/net/wireless/bcmdhd/bcmwifi_channels.c
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/802.11_bta.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/802.11e.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/802.3.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/bcmeth.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/bcmip.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/bt_amp_hci.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/eapol.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/sdspi.h
	both modified:      drivers/net/wireless/bcmdhd/common/include/proto/wpa.h
	both modified:      drivers/net/wireless/bcmdhd/dhd.h
	both modified:      drivers/net/wireless/bcmdhd/dhd_bta.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_bta.h
	both modified:      drivers/net/wireless/bcmdhd/dhd_bus.h
	both modified:      drivers/net/wireless/bcmdhd/dhd_cdc.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_cfg80211.h
	both modified:      drivers/net/wireless/bcmdhd/dhd_common.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_custom_gpio.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_dbg.h
	both added:         drivers/net/wireless/bcmdhd/dhd_ip.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_ip.h
	both modified:      drivers/net/wireless/bcmdhd/dhd_linux.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_linux_sched.c
	both added:         drivers/net/wireless/bcmdhd/dhd_pno.c
	both added:         drivers/net/wireless/bcmdhd/dhd_pno.h
	both modified:      drivers/net/wireless/bcmdhd/dhd_proto.h
	both modified:      drivers/net/wireless/bcmdhd/dhd_sdio.c
	both added:         drivers/net/wireless/bcmdhd/dhd_wlfc.c
	both modified:      drivers/net/wireless/bcmdhd/dhd_wlfc.h
	both modified:      drivers/net/wireless/bcmdhd/dngl_stats.h
	both modified:      drivers/net/wireless/bcmdhd/dngl_wlhdr.h
	both modified:      drivers/net/wireless/bcmdhd/hndpmu.c
	both modified:      drivers/net/wireless/bcmdhd/include/Makefile
	both modified:      drivers/net/wireless/bcmdhd/include/aidmp.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcm_cfg.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcm_mpool_pub.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmcdc.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmdefs.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmdevs.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmendian.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/bcmnvram.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/bcmpcispi.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmperf.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmsdbus.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmsdh.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmsdpcm.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmsdspi.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmsdstd.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmspi.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/bcmspibrcm.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/bcmsrom_fmt.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/bcmsrom_tbl.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmutils.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmwifi_channels.h
	both modified:      drivers/net/wireless/bcmdhd/include/bcmwifi_rates.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/dbus.h
	both modified:      drivers/net/wireless/bcmdhd/include/dhdioctl.h
	both modified:      drivers/net/wireless/bcmdhd/include/epivers.h
	both modified:      drivers/net/wireless/bcmdhd/include/hndpmu.h
	both modified:      drivers/net/wireless/bcmdhd/include/hndrte_armtrap.h
	both modified:      drivers/net/wireless/bcmdhd/include/hndrte_cons.h
	both modified:      drivers/net/wireless/bcmdhd/include/hndsoc.h
	both modified:      drivers/net/wireless/bcmdhd/include/linux_osl.h
	both modified:      drivers/net/wireless/bcmdhd/include/linuxver.h
	both modified:      drivers/net/wireless/bcmdhd/include/miniopt.h
	both modified:      drivers/net/wireless/bcmdhd/include/msgtrace.h
	both modified:      drivers/net/wireless/bcmdhd/include/osl.h
	both modified:      drivers/net/wireless/bcmdhd/include/packed_section_end.h
	both modified:      drivers/net/wireless/bcmdhd/include/packed_section_start.h
	both modified:      drivers/net/wireless/bcmdhd/include/pcicfg.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/proto/802.11.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/proto/bcmevent.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/proto/bcmipv6.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/proto/ethernet.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/proto/p2p.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/proto/wps.h
	both modified:      drivers/net/wireless/bcmdhd/include/sbchipc.h
	both modified:      drivers/net/wireless/bcmdhd/include/sbconfig.h
	both modified:      drivers/net/wireless/bcmdhd/include/sbhnddma.h
	both modified:      drivers/net/wireless/bcmdhd/include/sbpcmcia.h
	both modified:      drivers/net/wireless/bcmdhd/include/sbsdio.h
	both modified:      drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h
	both modified:      drivers/net/wireless/bcmdhd/include/sbsocram.h
	both modified:      drivers/net/wireless/bcmdhd/include/sdio.h
	both modified:      drivers/net/wireless/bcmdhd/include/sdioh.h
	both modified:      drivers/net/wireless/bcmdhd/include/sdiovar.h
	both modified:      drivers/net/wireless/bcmdhd/include/siutils.h
	deleted by them:    drivers/net/wireless/bcmdhd/include/spid.h
	both modified:      drivers/net/wireless/bcmdhd/include/trxhdr.h
	both modified:      drivers/net/wireless/bcmdhd/include/typedefs.h
	both modified:      drivers/net/wireless/bcmdhd/include/wlfc_proto.h
	both modified:      drivers/net/wireless/bcmdhd/include/wlioctl.h
	both modified:      drivers/net/wireless/bcmdhd/linux_osl.c
	both modified:      drivers/net/wireless/bcmdhd/sbutils.c
	both modified:      drivers/net/wireless/bcmdhd/siutils.c
	both modified:      drivers/net/wireless/bcmdhd/siutils_priv.h
	both modified:      drivers/net/wireless/bcmdhd/uamp_api.h
	both modified:      drivers/net/wireless/bcmdhd/wl_android.c
	both modified:      drivers/net/wireless/bcmdhd/wl_android.h
	both modified:      drivers/net/wireless/bcmdhd/wl_cfg80211.c
	both modified:      drivers/net/wireless/bcmdhd/wl_cfg80211.h
	both modified:      drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	both modified:      drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	both modified:      drivers/net/wireless/bcmdhd/wl_dbg.h
	both modified:      drivers/net/wireless/bcmdhd/wl_iw.c
	both modified:      drivers/net/wireless/bcmdhd/wl_iw.h
	both modified:      drivers/net/wireless/bcmdhd/wl_linux_mon.c
	both modified:      drivers/net/wireless/bcmdhd/wldev_common.c
	both modified:      drivers/net/wireless/bcmdhd/wldev_common.h
	both modified:      drivers/staging/android/ashmem.c
	both modified:      drivers/staging/android/lowmemorykiller.c
	both modified:      drivers/usb/gadget/android.c
	both added:         drivers/usb/gadget/f_audio_source.c
	both modified:      fs/proc/task_mmu.c
	both modified:      include/linux/freezer.h
	both modified:      include/linux/input.h
	both modified:      include/linux/ion.h
	both modified:      include/linux/ipv6.h
	both modified:      include/linux/pm_wakeup.h
	both modified:      include/net/ping.h
	both modified:      include/sound/soc.h
	both added:         include/trace/events/mmc.h
	both modified:      kernel/cgroup.c
	both modified:      kernel/futex.c
	both modified:      kernel/power/Kconfig
	both modified:      kernel/power/Makefile
	both modified:      kernel/power/main.c
	both modified:      kernel/power/power.h
	both modified:      kernel/power/process.c
	both modified:      kernel/power/suspend.c
	both added:         kernel/power/wakelock.c
	both modified:      kernel/sys.c
	both modified:      kernel/time/alarmtimer.c
	both added:         lib/lzo/lzo1x_decompress_safe.c
	both modified:      mm/mempolicy.c
	both modified:      net/core/flow_dissector.c
	both modified:      net/ipv4/ping.c
	both added:         net/ipv6/ping.c
	both modified:      net/ipv6/route.c
	both modified:      sound/soc/soc-core.c
	both modified:      sound/soc/soc-dapm.c

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	drivers/net/wireless/bcmdhd/dhd_ip.h~HEAD