Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull ACPI patch from Len Brown.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
ACPICA: Fix possible fault in return package object repair code

+1 -1
+1 -1
drivers/acpi/acpica/nspredef.c
··· 638 /* Create the new outer package and populate it */ 639 640 status = 641 - acpi_ns_wrap_with_package(data, *elements, 642 return_object_ptr); 643 if (ACPI_FAILURE(status)) { 644 return (status);
··· 638 /* Create the new outer package and populate it */ 639 640 status = 641 + acpi_ns_wrap_with_package(data, return_object, 642 return_object_ptr); 643 if (ACPI_FAILURE(status)) { 644 return (status);