diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-10 05:26:51 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-10 05:26:51 +0300 |
commit | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (patch) | |
tree | 3960ffcd424c9b61c485d6cc2966440c67f15485 /arch/arm/nwfpe/ARM-gcc.h | |
parent | 5cff3684192773a2c2b1102acd10b99aaa6a3f67 (diff) | |
parent | 60fdb44a23cbc5d8db224577e14ea667d7c53478 (diff) | |
download | linux-1c9dbd4615fd751e5e0b99807a3c7c8612e28e20.tar.xz |
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
Diffstat (limited to 'arch/arm/nwfpe/ARM-gcc.h')
0 files changed, 0 insertions, 0 deletions