From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 May 2010 15:16:34 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.35-rc1~272
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4961ab934a1254b1ad9420cea0ded617b57f022b;p=~emulex%2Finfiniband.git

Merge git://git.infradead.org/battery-2.6

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

4961ab934a1254b1ad9420cea0ded617b57f022b