diff options
| author | Linus Torvalds | 2017-11-15 22:35:43 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-15 22:35:43 +0100 |
| commit | 6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f (patch) | |
| tree | e6e7f723ea7ea51ccf79ad21a2715da00b4948c9 /fs/lockd/svclock.c | |
| parent | Merge tag 'selinux-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | dt-bindings: hsi: add omap4 hsi controller bindings (diff) | |
| download | kernel-qcow2-linux-6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f.tar.gz kernel-qcow2-linux-6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f.tar.xz kernel-qcow2-linux-6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f.zip | |
Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
- add HSI OMAP4 bindings
- misc small fixes
* tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
dt-bindings: hsi: add omap4 hsi controller bindings
HSI: hsi_char: pr_err() strings should end with newlines
HSI: omap_ssi_core: fix kilo to be "k" not "K"
Diffstat (limited to 'fs/lockd/svclock.c')
0 files changed, 0 insertions, 0 deletions