diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:55:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:55:44 +0200 |
| commit | de109c9868cf78a172ae580a83bf9a3a74a9b4bd (patch) | |
| tree | 8b555db133d85b19538c0c0ac555e999c91f166e /drivers/net/caif | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | apm_power: Add missing break statement (diff) | |
| download | linux-de109c9868cf78a172ae580a83bf9a3a74a9b4bd.tar.xz linux-de109c9868cf78a172ae580a83bf9a3a74a9b4bd.zip | |
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/net/caif')
0 files changed, 0 insertions, 0 deletions