summaryrefslogtreecommitdiff
path: root/drivers/hsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-06 20:05:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-06 20:05:34 -0700
commit0498cf8429011ec968870b3fee7570a751575a35 (patch)
tree1e0cd91db7a780c323fb97b0fbae8a9da51cae03 /drivers/hsi
parent85417aef44fc58b08773117ceb1bc6ca5684e973 (diff)
parent5e37195f30cc31e6a1052cbc282254e127c1b8c7 (diff)
Merge tag 'for-v3.17' of git://git.infradead.org/battery-2.6
Pull power supply changes from Sebastian Reichel: - Added iPaq h3xxx battery driver - Added Broadcom STB reset driver - DT support for rx51-battery - misc. fixes * tag 'for-v3.17' of git://git.infradead.org/battery-2.6: ipaq_micro_battery: fix sparse non static symbol warning power: add driver for battery reading on iPaq h3xxx power: twl4030_charger: detect battery presence prior to enabling charger power: reset: Add reboot driver for brcmstb power_supply: Fix sparse non static symbol warning power_supply: Add inlmt,iterm, min/max temp props charger: tps65090: Allow charger module to be used when no irq power/reset: Fix GPL v2 license string typo power: poweroff: gpio: convert to use descriptors bq27000: report missing device better. bq27x00_battery: Introduce the use of the managed version of kzalloc Documentation: DT: Document rx51-battery binding rx51_battery: convert to iio consumer bq2415x_charger: Fix Atomic Sleep Bug
Diffstat (limited to 'drivers/hsi')
0 files changed, 0 insertions, 0 deletions