tree 3960ffcd424c9b61c485d6cc2966440c67f15485
parent 5cff3684192773a2c2b1102acd10b99aaa6a3f67
parent 60fdb44a23cbc5d8db224577e14ea667d7c53478
author Linus Torvalds <torvalds@linux-foundation.org> 1510280811 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1510280811 -0800

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