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

regulator: ab8500: Remove ab8500_regulator_debug_init/exit()

2014-06-22 11:51:47 +01:00

act8846.h

rk3288:pmic:act8846&syr82x:modify some warnings

2014-06-12 15:38:12 +08:00

act8865.h

regulator: act8865: Add act8600 support

2015-03-06 19:43:28 +00:00

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

regulator: fan53555: Prevent multiple include of fan53555.h

2013-08-07 10:38:16 +01:00

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

regulator: max1586: add device-tree support

2014-09-01 11:35:45 +01:00

max8649.h

…

max8660.h

regulators: max8660: add DT bindings

2013-08-02 17:29:54 +01:00

max8952.h

regulator: max8952: Add Device Tree support

2013-04-05 11:20:52 +01:00

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

regulator: mt6397: Add support for MT6397 regulator

2014-12-24 12:41:05 +00:00

of_regulator.h

regulator: of: Pass the regulator description in the match table

2014-11-26 18:58:14 +00:00

pfuze100.h

regulator: pfuze100-regulator: add pfuze3000 support

2015-01-09 12:22:18 +00:00

ricoh619-regulator.h

ricoh619:support pmic ricoh619

2013-04-27 15:45:44 +08:00

rk2818_lp8725.h

…

rockchip_io_vol_domain.h

linux3.10: renamed io_vol_domain to rockchip_io_domain

2014-02-28 10:45:18 +08:00

rockchip-pwm-regulator.h

rk312x:support pwm set arm and logic voltages

2014-08-07 10:54:52 +08:00

rt5025-regulator.h

rk312x:rt5025:support pmic rt5025

2014-08-22 10:01:21 +08:00

rt5036-regulator.h

rk312x:pmic:rt5036:support pmic rt5036 drivers

2014-09-11 14:28:23 +08:00

tps6507x.h

…

tps51632-regulator.h

…

tps62360.h

…

userspace-consumer.h

…