diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-28 19:41:05 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-28 19:41:05 -1000 |
| commit | adda766193ea1cf3137484a9521972d080d0b7af (patch) | |
| tree | fa7552d8051397ac7e1497f7239e3a7afb0ed89b /block/blk-sysfs.c | |
| parent | 8442edc18843491978f7820f87dbdf293461290e (diff) | |
| parent | e29b3ee3b005897fbdcfdd4b3190776e38739d70 (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:
ACPI: don't free non-existent backlight in acpi video module
toshiba_acpi: return on a fail path
ACPICA: Windows compatibility fix: same buffer/string store
Diffstat (limited to 'block/blk-sysfs.c')
0 files changed, 0 insertions, 0 deletions