From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Aug 2009 05:41:05 +0000 (-1000)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v2.6.31-rc9~33
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=adda766193ea1cf3137484a9521972d080d0b7af;p=linux.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:
  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
---

adda766193ea1cf3137484a9521972d080d0b7af