Merge git://git.infradead.org/battery-2.6
commit1df1a4cbcd33cf66111293c654dcff0199d965f0
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 15:35:15 +0000 (28 08:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 15:35:15 +0000 (28 08:35 -0700)
treec6926cda1a53e48bffbcc9ff4a64dc307767b5fa
parented2e5581d2702743460349e494f3ab8c4b0f28d8
parent23886839a752401aba66517bff8a8b91549279ce
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply: Mark twl4030_charger as broken