Merge git://git.infradead.org/users/cbou/battery-2.6.26
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jun 2008 02:28:31 +0000 (19:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jun 2008 02:28:31 +0000 (19:28 -0700)
* git://git.infradead.org/users/cbou/battery-2.6.26:
  power_supply: Fix race in power_supply_uevent


Trivial merge