diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 12:55:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 12:55:44 -0700 |
| commit | de109c9868cf78a172ae580a83bf9a3a74a9b4bd (patch) | |
| tree | 8b555db133d85b19538c0c0ac555e999c91f166e /drivers/edac/edac_module.h | |
| parent | 7fd3fce3a0a103bd6367889023c930ce3292d56a (diff) | |
| parent | 1d220334d6a8a711149234dc5f98d34ae02226b8 (diff) | |
Merge git://git.infradead.org/users/cbou/battery-2.6.36
* 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
Diffstat (limited to 'drivers/edac/edac_module.h')
0 files changed, 0 insertions, 0 deletions