From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 4 Jan 2017 15:38:39 +0000 (+0100)
Subject: Merge tag 'psci-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lpierali... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c6ec6a02c1378ba0e3ac530f8c80523ea74e5de;p=linux-beck.git

Merge tag 'psci-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into fixes

Pull "PSCI fixes for v4.10" from Lorenzo Pieralisi:

Two minor fixes following the merge of the PSCI checker:

- Annotate the PSCI checker timer on the stack used to wake-up from
  suspend to prevent warnings when the DEBUG_OBJECTS config option
  is enabled
- Extend the PSCI entry in the maintainers list to also include the
  PSCI checker code

* tag 'psci-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux:
  MAINTAINERS: extend PSCI entry to cover the newly add PSCI checker code
  drivers: psci: annotate timer on stack to silence odebug messages
---

5c6ec6a02c1378ba0e3ac530f8c80523ea74e5de