From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Nov 2017 02:26:51 +0000 (-0800)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v4.14~11
X-Git-Url: http://git.ipfire.org/?p=people%2Farne_f%2Fkernel.git;a=commitdiff_plain;h=1c9dbd4615fd751e5e0b99807a3c7c8612e28e20

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
---

1c9dbd4615fd751e5e0b99807a3c7c8612e28e20