diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 01:45:53 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 01:45:53 +0200 |
commit | fbdbf8389976b9f40d36f21985be28a0f438f779 (patch) | |
tree | 3422ed473f0185936fa2c11261490f199fb6586e /block/Kconfig | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes (diff) | |
parent | Add ds2782 battery gas gauge driver (diff) | |
download | linux-fbdbf8389976b9f40d36f21985be28a0f438f779.tar.xz linux-fbdbf8389976b9f40d36f21985be28a0f438f779.zip |
Merge git://git.infradead.org/users/cbou/battery-2.6.31
* git://git.infradead.org/users/cbou/battery-2.6.31:
Add ds2782 battery gas gauge driver
olpc_battery: Ensure that the TRICKLE bit is checked
olpc_battery: Fix up eeprom read function
Diffstat (limited to 'block/Kconfig')
0 files changed, 0 insertions, 0 deletions