diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:45:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:45:53 -0700 |
| commit | fbdbf8389976b9f40d36f21985be28a0f438f779 (patch) | |
| tree | 3422ed473f0185936fa2c11261490f199fb6586e /drivers/scsi/pcmcia/nsp_io.h | |
| parent | 79af3133174da620171eea82bb505a5a5cb7c6f4 (diff) | |
| parent | bfdb46ce8494eae30dbaae65c81e684e6db6228b (diff) | |
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 'drivers/scsi/pcmcia/nsp_io.h')
0 files changed, 0 insertions, 0 deletions