diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-16 22:04:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-16 22:04:13 +0200 |
| commit | 7dc074348eb85d48f7a1fa96879458f4becf68a7 (patch) | |
| tree | af626c941574ea68f7d74da04d81e302fbc14a68 /drivers/char/Kconfig | |
| parent | MAINTAINERS: remove myself as staging FBTFT maintainer (diff) | |
| parent | Linux 4.19-rc4 (diff) | |
| download | linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.xz linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.zip | |
Merge 4.19-rc4 into staging-next
Handle the merge issues and take the iio and staging driver fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/Kconfig')
| -rw-r--r-- | drivers/char/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index ce277ee0a28a..40728491f37b 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -566,5 +566,5 @@ config RANDOM_TRUST_CPU that CPU manufacturer (perhaps with the insistence or mandate of a Nation State's intelligence or law enforcement agencies) has not installed a hidden back door to compromise the CPU's - random number generation facilities. - + random number generation facilities. This can also be configured + at boot with "random.trust_cpu=on/off". |