summaryrefslogtreecommitdiff
path: root/net/ipv4/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/Makefile')
0 files changed, 0 insertions, 0 deletions
2061a553a057d7'>diff)parent32d53d1baf874caabe66ba565699ed5853fa2b6f (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