tree 66c948222e45b461f9d1b8917b222a0c90af9e6e
parent e098675635479e9267cf2b12fb969c463cf506ab
parent 35bf559145b6332f5465c15a4e5cd7a363985382
author Linus Torvalds <torvalds@linux-foundation.org> 1209837477 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209837477 -0700

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