tree de4d00534631ba1ff4a2f1c58d5dbe4a52937d5b
parent d5301a0e884b0dced6e13837f00505f871e3458f
parent 56fa18e8f1ef6b3995a4511e61103d0f9205ff4a
author Linus Torvalds <torvalds@linux-foundation.org> 1213064911 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213064911 -0700

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