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)
commit496b0b57c00f2193f2902dd70b219df5a4dfce94
treeee152ae53deb7d1369baa284f60a78aad89e0c1a
parent650e5455d83dafb465b478000507468152d3c523
parent9db22d928ca92629f0deb18efed265c4b7c2aa5e
Merge tag 'pm+acpi-4.4-final' of git://git./linux/kernel/git/rafael/linux-pm

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