Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Mar 2011 23:26:57 +0000 (15:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Mar 2011 23:26:57 +0000 (15:26 -0800)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI / ACPICA: Implicit notify for multiple devices
  ACPI / debugfs: Fix buffer overflows, double free


Trivial merge