From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 10 Jul 2007 21:47:59 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/battery-2.6
X-Git-Tag: v2.6.23-rc1~1154
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f60cfd932b42c69ed3226400cb5eab152576c3a;p=linux-2.6

Merge git://git.infradead.org/~dwmw2/battery-2.6

* git://git.infradead.org/~dwmw2/battery-2.6:
  [BATTERY] ds2760 W1 slave
  [BATTERY] One Laptop Per Child power/battery driver
  [BATTERY] Apple PMU driver
  [BATTERY] 1-Wire ds2760 chip battery driver
  [BATTERY] APM emulation driver for class batteries
  [BATTERY] pda_power platform driver
  [BATTERY] Universal power supply class (was: battery class)
---

5f60cfd932b42c69ed3226400cb5eab152576c3a