Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 15:35:15 +0000 (08:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 15:35:15 +0000 (08:35 -0700)
* git://git.infradead.org/battery-2.6:
  power_supply: Mark twl4030_charger as broken


Trivial merge