OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1dcb202f42
linux/drivers/power
History
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
apm_power.c apm_power: Add missing break statement 2010-09-08 14:35:10 +04:00
bq20z75.c bq20z75: Add support for more power supply properties 2010-09-28 16:42:35 +04:00
bq27x00_battery.c bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove() 2010-10-06 17:38:15 +04:00
collie_battery.c
da9030_battery.c
ds2760_battery.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
ds2782_battery.c ds2782_battery: Fix units 2010-10-06 17:36:49 +04:00
intel_mid_battery.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
isp1704_charger.c power_supply: Add isp1704 charger detection driver 2010-08-19 16:25:20 +04:00
jz4740-battery.c jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove() 2010-09-28 15:52:23 +04:00
Kconfig power: Revert "power_supply: Mark twl4030_charger as broken" 2010-10-29 00:30:44 +02:00
Makefile power_supply: Makefile cleanup 2010-10-06 17:38:42 +04:00
max8925_power.c
max17040_battery.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
olpc_battery.c olpc_battery: Fix endian neutral breakage for s16 values 2010-09-28 15:14:31 +04:00
pcf50633-charger.c pcf50633-charger: Add missing sysfs_remove_group() 2010-09-22 16:14:49 +04:00
pda_power.c
pmu_battery.c
power_supply_core.c power_supply: Use attribute groups 2010-05-19 12:14:28 +04:00
power_supply_leds.c
power_supply_sysfs.c power_supply: Introduce maximum current property 2010-10-06 17:37:22 +04:00
power_supply.h power_supply: Use attribute groups 2010-05-19 12:14:28 +04:00
s3c_adc_battery.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
test_power.c
tosa_battery.c
twl4030_charger.c power_supply: Add driver for TWL4030/TPS65950 BCI charger 2010-09-30 19:28:09 +04:00
wm97xx_battery.c [ARM] wm97xx_batt: remove now useless header file 2010-08-05 14:32:15 +08:00
wm831x_backup.c
wm831x_power.c wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove() 2010-09-28 15:52:34 +04:00
wm8350_power.c
z2_battery.c [ARM] pxa/z2: fix missing include in battery driver 2010-06-13 23:55:13 +08:00