From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 15:35:15 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.37-rc1~74
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=1df1a4cbcd33cf66111293c654dcff0199d965f0

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

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

1df1a4cbcd33cf66111293c654dcff0199d965f0