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

ab8500_bmdata: Export abx500_res_to_temp tables for hwmon

2013-04-16 17:38:10 -07:00

bq27xxx_battery.h

power: bq27xxx_battery: Add support for additional bq27xxx family devices

2015-09-23 17:15:27 +02:00

bq2415x_charger.h

bq2415x_charger: Use power_supply notifier for automode

2013-12-23 17:58:03 -08:00

bq24190_charger.h

bq24190_charger: Add support for TI BQ24190 Battery Charger

2013-08-27 18:17:54 -07:00

bq24296_charger.h

bq24296: fix reboot warning

2014-04-01 18:31:09 +08:00

bq24735-charger.h

power_supply: Add support for bq24735 charger

2013-10-25 15:56:51 -07:00

charger-manager.h

power: charger-manager: comment spelling fixes

2015-09-22 16:04:30 +02:00

cw2015_battery.h

power_supply: cw2015_battery: code style fixes

2015-09-28 15:49:22 +08:00

generic-adc-battery.h

power: battery: Generic battery driver using IIO

2012-09-22 10:40:23 +01:00

gpio-charger.h

…

isp1704_charger.h

isp1704_charger: Add DT support

2013-12-23 18:34:58 -08:00

jz4740-battery.h

…

max8903_charger.h

power_supply: Add driver for MAX8903 charger

2011-04-20 17:48:48 +04:00

max17042_battery.h

power: max17042_battery: add HEALTH and TEMP_* properties support

2015-05-23 22:43:28 +02:00

ricoh61x_battery_init.h

rk3288:ricoh619&syb827:support pmic ricoh619 and dcdc syb827

2014-04-14 14:39:17 +08:00

ricoh619_battery.h

rk3288:pmic:ricoh619:modify some warnings

2014-06-12 15:33:37 +08:00

rk_usbbc.h

usb: bc: fix function name in hader file

2015-06-24 09:59:25 +08:00

rockchip-6200ma-bat.h

rk3188:pmu_rt5025:updata rt5025 drivers,modify some bug

2013-08-10 10:28:23 +08:00

rockchip-adc-battery.h

adc-battery: add the function of auto-calibration the reference-voltage

2014-11-03 10:05:29 +08:00

rockchip-general-bat.h

rk312x:rt5025:support pmic rt5025

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

rt5025-battery.h

rk312x:rt5025:support pmic rt5025

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

rt5025-charger.h

rk312x:rt5025:support pmic rt5025

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

rt5025-power.h

rk31:pmu:rt5025:support AC & usb charger

2013-10-23 10:51:17 +08:00

rt5025-swjeita.h

rk3188:pmu:rt5025:updata rt5025 drivers, modify some fg and charger bug

2013-08-24 16:17:34 +08:00

rt5036-charger.h

rk312x:pmic:rt5036:support pmic rt5036 drivers

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

rt-battery.h

rk312x:pmic:rt5036:support pmic rt5036 drivers

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

rt-power.h

rk312x:pmic:rt5036:support pmic rt5036 drivers

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

sbs-battery.h

sbs-battery: Rename internals to new name

2012-01-06 05:22:21 +04:00

smartreflex.h

PM / AVS: SmartReflex: use omap_sr * for enable/disable interface

2013-06-10 10:46:18 -07:00

smb347-charger.h

rk: temp revert rk change

2013-11-08 21:33:42 +08:00

twl4030_madc_battery.h

power: Add twl4030_madc battery driver.

2013-08-30 17:34:52 -07:00