From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 May 2008 17:57:57 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.26-rc1~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e80121bd7d0c493072442ac7eddcba165a07a8;p=linux-2.6

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

* git://git.infradead.org/battery-2.6:
  PMU battery: filenames in sysfs with spaces
  pda_power: add init and exit function callbacks
---

38e80121bd7d0c493072442ac7eddcba165a07a8