From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2016 23:50:59 +0000 (-0800)
Subject: Merge tag 'pm+acpi-4.4-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~176^2~484
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=496b0b57c00f2193f2902dd70b219df5a4dfce94;p=firefly-linux-kernel-4.4.55.git

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
---

496b0b57c00f2193f2902dd70b219df5a4dfce94