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
bq27xxx_battery.h	power: bq27xxx_battery: Add support for additional bq27xxx family devices	2015-09-23 17:15:27 +02:00
bq2415x_charger.h
bq24190_charger.h
bq24296_charger.h
bq24735-charger.h
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
gpio-charger.h
isp1704_charger.h
jz4740-battery.h
max8903_charger.h
max17042_battery.h	power: max17042_battery: add HEALTH and TEMP_* properties support	2015-05-23 22:43:28 +02:00
ricoh61x_battery_init.h
ricoh619_battery.h
rk_usbbc.h	usb: bc: fix function name in hader file	2015-06-24 09:59:25 +08:00
rockchip-6200ma-bat.h
rockchip-adc-battery.h
rockchip-general-bat.h
rt-battery.h
rt-power.h
rt5025-battery.h
rt5025-charger.h
rt5025-power.h
rt5025-swjeita.h
rt5036-charger.h
sbs-battery.h
smartreflex.h
smb347-charger.h
twl4030_madc_battery.h