summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-12-13 10:36:39 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-12-13 10:36:39 +0100
commitc24889167583c2e7fbd1a9e12ef508c8405f6fd4 (patch)
tree4be6b8654d135b554253b6ab22c314260a413751 /lib
parent38bf57fa7b671f2bf7530888aa8199450265c5c8 (diff)
parent868c97a846a73e937d835b09b8c885a69df50ec8 (diff)
downloadlinux-stable-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.gz
linux-stable-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.bz2
linux-stable-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.zip
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.debug2
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
be included, not that the timestamp is recorded.
The behavior is also controlled by the kernel command line
- parameter printk.time=1. See Documentation/kernel-parameters.txt
+ parameter printk.time=1. See Documentation/admin-guide/kernel-parameters.rst
config MESSAGE_LOGLEVEL_DEFAULT
int "Default message log level (1-7)"