q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/power
History
Linus Torvalds 16bb85bc12 Merge git://git.infradead.org/battery-2.6 
* git://git.infradead.org/battery-2.6:
  intel_mid_battery: Fix battery scaling
  intel_mid_battery: Fix the argument order to intel_scu_ipc_command
  olpc_battery: Fix build failure caused by sysfs changes
  Add s3c-adc-battery driver
  Intel MID platform battery driver

Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
2010-08-12 09:58:33 -07:00
..
apm_power.c Driver Core: add ability for class_for_each_device to start in middle of list 2008-07-21 21:54:47 -07:00
bq27x00_battery.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
collie_battery.c collie: add battery driver 2009-11-27 21:07:23 +01:00
da9030_battery.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ds2760_battery.c ds2760_battery: Make charge_now and charge_full writeable 2010-05-19 12:14:42 +04:00
ds2782_battery.c Merge git://git.infradead.org/users/cbou/battery-2.6.35 2010-07-27 09:22:55 -07:00
intel_mid_battery.c intel_mid_battery: Fix battery scaling 2010-08-10 14:35:27 +04:00
jz4740-battery.c POWER: Add JZ4740 battery driver. 2010-08-05 13:26:20 +01:00
Kconfig Merge git://git.infradead.org/battery-2.6 2010-08-12 09:58:33 -07:00
Makefile Merge git://git.infradead.org/battery-2.6 2010-08-12 09:58:33 -07:00
max8925_power.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
max17040_battery.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
olpc_battery.c power: Remove owner field from attribute initialization code in OLPC driver 2010-08-10 15:33:09 -07:00
pcf50633-charger.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pda_power.c pda_power: Add function callbacks for suspend and resume 2010-04-16 19:14:34 +04:00
pmu_battery.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
power_supply.h power_supply: Use attribute groups 2010-05-19 12:14:28 +04:00
power_supply_core.c power_supply: Use attribute groups 2010-05-19 12:14:28 +04:00
power_supply_leds.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
power_supply_sysfs.c power_supply: Fix regression for 'type' property 2010-05-25 13:52:58 +04:00
s3c_adc_battery.c Add s3c-adc-battery driver 2010-07-23 17:08:41 +04:00
test_power.c power_supply: Add test_power driver 2010-05-18 19:58:56 +04:00
tosa_battery.c tosa_battery: Fix build error due to direct driver_data usage 2010-05-03 00:02:56 +04:00
wm97xx_battery.c [ARM] wm97xx_batt: remove now useless header file 2010-08-05 14:32:15 +08:00
wm831x_backup.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wm831x_power.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-04-26 21:56:19 +04:00
wm8350_power.c mfd: Update WM8350 drivers for changed interrupt numbers 2010-03-07 22:16:58 +01:00
z2_battery.c [ARM] pxa/z2: fix missing include in battery driver 2010-06-13 23:55:13 +08:00