summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-25 01:35:57 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-25 01:35:57 +0400
commitf27884aeadff9654f4a1e8a05dd92f4b140afe29 (patch)
tree22db0c732fcc4e68be25190454631ee1d249e295 /Makefile
parentc6223048259006759237d826219f0fa4f312fb47 (diff)
parenta35d01a5d2ac533edab94a8e3b6749ab213c91c5 (diff)
downloadlinux-f27884aeadff9654f4a1e8a05dd92f4b140afe29.tar.xz
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 'Makefile')
0 files changed, 0 insertions, 0 deletions