Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Aug 2011 19:21:19 +0000 (12:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Aug 2011 19:21:19 +0000 (12:21 -0700)
commitf38092b50f6e68d046ada7d2a4b3ecbbeab29fb4
treee9da23bda0270a04478f29e8eda9b8cc6460d0b6
parent4b00e4b3940eabb38adeec0823751820fe2d6fda
parent5389102e231d5f06da8b2897336293db18af9d76
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  Battery: sysfs_remove_battery(): possible circular locking