]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cff368 60fdb44)
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)
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

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.