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
..
ab8500.h
act8846.h
act8865.h
act8891.h
act8931.h
charge-regulator.h
consumer.h	rk: temp revert rk change	2015-11-11 15:54:30 +08:00
da9211.h	regulator: da9211: support da9215	2015-07-13 19:11:24 +01:00
db8500-prcmu.h
driver.h	regulator: introduce min_dropout_uV	2015-10-16 17:57:33 +01:00
fan53555.h
fixed.h
gpio-regulator.h
lp872x.h
lp3971.h
lp3972.h
machine.h	regulator: Add over current protection (OCP) support	2015-07-24 18:28:46 +01:00
max1586.h
max8649.h
max8660.h
max8952.h
max8973-regulator.h	regulator: max8973: add mechanism to enable/disable through GPIO	2015-05-22 13:47:33 +01:00
mt6311.h	regulator: mt6311: Add support for mt6311 regulator	2015-07-24 12:30:49 +01:00
mt6397-regulator.h
of_regulator.h
pfuze100.h
ricoh619-regulator.h
rk2818_lp8725.h
rockchip-pwm-regulator.h
rockchip_io_vol_domain.h
rt5025-regulator.h
rt5036-regulator.h
tps6507x.h
tps51632-regulator.h
tps62360.h
userspace-consumer.h