diff options
| author | Linus Torvalds | 2016-07-27 19:47:24 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-07-27 19:47:24 +0200 |
| commit | ba4f67899f9b3091744da4a4ce4057123ed02c4e (patch) | |
| tree | f5f9fffaa3f0b67a6e143b5650b11324c124b58c /include/uapi/linux/parport.h | |
| parent | Merge tag 'for-f2fs-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jae... (diff) | |
| parent | dlm: Use kmemdup instead of kmalloc and memcpy (diff) | |
| download | kernel-qcow2-linux-ba4f67899f9b3091744da4a4ce4057123ed02c4e.tar.gz kernel-qcow2-linux-ba4f67899f9b3091744da4a4ce4057123ed02c4e.tar.xz kernel-qcow2-linux-ba4f67899f9b3091744da4a4ce4057123ed02c4e.zip | |
Merge tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland:
"This set includes two trivial changes, one to use kmemdup and another
to control the log level of recovery messages"
* tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: Use kmemdup instead of kmalloc and memcpy
dlm: add log_info config option
Diffstat (limited to 'include/uapi/linux/parport.h')
0 files changed, 0 insertions, 0 deletions