diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:38:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:38:39 +0100 |
| commit | 5c6ec6a02c1378ba0e3ac530f8c80523ea74e5de (patch) | |
| tree | c52cba21a42b9bfe4762d93804a9c8d2357be02a /include/net/phonet | |
| parent | 46db9914c3bf9d7aa292bc03eb2061a553a057d7 (diff) | |
| parent | 32d53d1baf874caabe66ba565699ed5853fa2b6f (diff) | |
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
Diffstat (limited to 'include/net/phonet')
0 files changed, 0 insertions, 0 deletions