diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 04:36:39 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 04:36:39 -0500 |
| commit | c24889167583c2e7fbd1a9e12ef508c8405f6fd4 (patch) | |
| tree | 4be6b8654d135b554253b6ab22c314260a413751 /lib | |
| parent | 38bf57fa7b671f2bf7530888aa8199450265c5c8 (diff) | |
| parent | 868c97a846a73e937d835b09b8c885a69df50ec8 (diff) | |
Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next
Backmerge the docs-next branch from Jon into drm-misc so that we can
apply the dma-buf documentation cleanup patches. Git found a conflict
where there was none because both drm-misc and docs had identical
patches to clean up file rename issues in the rst include directives.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a6c8db1d62f6..ee26429b3db0 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -13,7 +13,7 @@ config PRINTK_TIME | |||
| 13 | be included, not that the timestamp is recorded. | 13 | be included, not that the timestamp is recorded. |
| 14 | 14 | ||
| 15 | The behavior is also controlled by the kernel command line | 15 | The behavior is also controlled by the kernel command line |
| 16 | parameter printk.time=1. See Documentation/kernel-parameters.txt | 16 | parameter printk.time=1. See Documentation/admin-guide/kernel-parameters.rst |
| 17 | 17 | ||
| 18 | config MESSAGE_LOGLEVEL_DEFAULT | 18 | config MESSAGE_LOGLEVEL_DEFAULT |
| 19 | int "Default message log level (1-7)" | 19 | int "Default message log level (1-7)" |