Huang, Tao bbf44583ac Merge branch 'torvalds/master' ... Signed-off-by: Huang, Tao <huangtao@rock-chips.com> Conflicts: arch/arm/include/asm/arm-cci.h drivers/android/binder.c drivers/android/binder_trace.h drivers/block/zram/Kconfig drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h include/kvm/arm_arch_timer.h include/linux/pl320-ipc.h include/linux/zsmalloc.h include/uapi/linux/android/binder.h		2015-11-11 19:52:00 +08:00
..
event	PM / devfreq: exynos-ppmu: bit-wise operation bugfix.	2015-09-11 14:22:26 +09:00
exynos	devfreq: exynos: drop owner assignment from platform_drivers	2014-10-20 16:20:27 +02:00
ddr_rk3368.c	rk3368 ddr: add configure ddr timing function	2015-09-15 16:30:38 +08:00
devfreq-event.c	PM / devfreq: event: Add devfreq_event class	2015-01-30 17:56:40 +09:00
devfreq.c	PM / devfreq: fix double kfree	2015-10-02 11:05:58 +09:00
governor.h
governor_performance.c
governor_powersave.c
governor_simpleondemand.c	PM / devfreq: cache the last call to get_dev_status()	2015-09-11 14:23:28 +09:00
governor_userspace.c
Kconfig	rk: temp revert rk change	2015-11-11 15:54:30 +08:00
Makefile	rk: temp revert rk change	2015-11-11 15:54:30 +08:00
tegra-devfreq.c	PM / devfreq: tegra: Update governor to use devfreq_update_stats()	2015-09-11 14:23:30 +09:00