diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 08:16:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 08:16:34 -0700 |
| commit | 4961ab934a1254b1ad9420cea0ded617b57f022b (patch) | |
| tree | f48ee16ff167f1b54ef6608986ba8155194610b4 /drivers/pci/pci-sysfs.c | |
| parent | bf87eae94880f1b79c2828d8705f0d97e961f168 (diff) | |
| parent | bbabb158f0e9d41174ae5c2183a8e4f981daf6ce (diff) | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
power_supply: Fix regression for 'type' property
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
0 files changed, 0 insertions, 0 deletions