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-Tag: v2.6.26-rc6~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=849bf20e732a71ca717a5c6f988bf3acc2a84a0c;p=linux-2.6-omap-h63xx.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