| commit | f38092b50f6e68d046ada7d2a4b3ecbbeab29fb4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 06 12:21:19 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 06 12:21:19 2011 -0700 |
| tree | e9da23bda0270a04478f29e8eda9b8cc6460d0b6 | |
| parent | 4b00e4b3940eabb38adeec0823751820fe2d6fda [diff] | |
| parent | 5389102e231d5f06da8b2897336293db18af9d76 [diff] |
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