tree fa7552d8051397ac7e1497f7239e3a7afb0ed89b
parent 8442edc18843491978f7820f87dbdf293461290e
parent e29b3ee3b005897fbdcfdd4b3190776e38739d70
author Linus Torvalds <torvalds@linux-foundation.org> 1251524465 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1251524465 -1000

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