Merge git://git.infradead.org/users/cbou/battery-2.6.36

Browse source

* git://git.infradead.org/users/cbou/battery-2.6.36:
  apm_power: Add missing break statement
  intel_pmic_battery: Fix battery charging status on mrst

...

This commit is contained in:

Linus Torvalds 2010-09-16 12:55:44 -07:00

parent 7fd3fce3a0 1d220334d6

commit de109c9868

2 changed files with 4 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/power/apm_power.c

View file

6

drivers/power/intel_mid_battery.c

View file