Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Nov 2017 02:26:51 +0000 (18:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Nov 2017 02:26:51 +0000 (18:26 -0800)
commit1c9dbd4615fd751e5e0b99807a3c7c8612e28e20
tree3960ffcd424c9b61c485d6cc2966440c67f15485
parent5cff3684192773a2c2b1102acd10b99aaa6a3f67
parent60fdb44a23cbc5d8db224577e14ea667d7c53478
Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: update TPM driver infrastructure changes
  sysctl: add register_sysctl() dummy helper
MAINTAINERS