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)
commit849bf20e732a71ca717a5c6f988bf3acc2a84a0c
treede4d00534631ba1ff4a2f1c58d5dbe4a52937d5b
parentd5301a0e884b0dced6e13837f00505f871e3458f
parent56fa18e8f1ef6b3995a4511e61103d0f9205ff4a
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