diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 14:35:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 14:35:57 -0700 |
| commit | f27884aeadff9654f4a1e8a05dd92f4b140afe29 (patch) | |
| tree | 22db0c732fcc4e68be25190454631ee1d249e295 /arch/arm/mach-u300/include | |
| parent | Merge branches 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs-2.6,audit-current} (diff) | |
| parent | da9030_battery: Fix race between event handler and monitor (diff) | |
| download | linux-dev-f27884aeadff9654f4a1e8a05dd92f4b140afe29.tar.xz linux-dev-f27884aeadff9654f4a1e8a05dd92f4b140afe29.zip | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
da9030_battery: Fix race between event handler and monitor
Add MAX17040 Fuel Gauge driver
w1: ds2760_battery: add support for sleep mode feature
w1: ds2760: add support for EEPROM read and write
ds2760_battery: cleanups in ds2760_battery_probe()
Diffstat (limited to 'arch/arm/mach-u300/include')
0 files changed, 0 insertions, 0 deletions