From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jun 2008 02:28:31 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/cbou/battery-2.6.26
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=849bf20e732a71ca717a5c6f988bf3acc2a84a0c;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge git://git.infradead.org/users/cbou/battery-2.6.26

* git://git.infradead.org/users/cbou/battery-2.6.26:
  power_supply: Fix race in power_supply_uevent
---

849bf20e732a71ca717a5c6f988bf3acc2a84a0c