diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:57:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:57:57 -0400 |
commit | 38e80121bd7d0c493072442ac7eddcba165a07a8 (patch) | |
tree | 66c948222e45b461f9d1b8917b222a0c90af9e6e /include/asm-x86 | |
parent | e098675635479e9267cf2b12fb969c463cf506ab (diff) | |
parent | 35bf559145b6332f5465c15a4e5cd7a363985382 (diff) |
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
Diffstat (limited to 'include/asm-x86')
0 files changed, 0 insertions, 0 deletions