Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 15:16:34 +0000 (08:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 15:16:34 +0000 (08:16 -0700)
commit4961ab934a1254b1ad9420cea0ded617b57f022b
treef48ee16ff167f1b54ef6608986ba8155194610b4
parentbf87eae94880f1b79c2828d8705f0d97e961f168
parentbbabb158f0e9d41174ae5c2183a8e4f981daf6ce
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply: Fix regression for 'type' property