Merge tag 'pm+acpi-4.4-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2016 23:50:59 +0000 (15:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2016 23:50:59 +0000 (15:50 -0800)
Pull ACPI fix from Rafael Wysocki:
 "Just one obvious fix that adds a missing function argument in ACPI
  code introduced recently (Kees Cook)"

* tag 'pm+acpi-4.4-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / property: avoid leaking format string into kobject name


Trivial merge