From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Aug 2011 19:21:19 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v3.1-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f38092b50f6e68d046ada7d2a4b3ecbbeab29fb4;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'release' of git://git.kernel.org/pub/scm/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
---

f38092b50f6e68d046ada7d2a4b3ecbbeab29fb4