]> err.no Git - linux-2.6/commit
Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2008 17:57:57 +0000 (10:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2008 17:57:57 +0000 (10:57 -0700)
commit38e80121bd7d0c493072442ac7eddcba165a07a8
tree66c948222e45b461f9d1b8917b222a0c90af9e6e
parente098675635479e9267cf2b12fb969c463cf506ab
parent35bf559145b6332f5465c15a4e5cd7a363985382
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