| commit | 4961ab934a1254b1ad9420cea0ded617b57f022b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 25 08:16:34 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 25 08:16:34 2010 -0700 |
| tree | f48ee16ff167f1b54ef6608986ba8155194610b4 | |
| 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