]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Aug 2009 05:41:05 +0000 (19:41 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Aug 2009 05:41:05 +0000 (19:41 -1000)
* '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


Trivial merge