diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:17:57 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:17:57 +0200 |
| commit | f77d26a9fc525286bcef3d4f98b52e17482cf49c (patch) | |
| tree | 6b179c9aa84787773cb601a14a64255e2912154b /net/lapb | |
| parent | EDAC/amd64: Add AMD family 17h model 60h PCI IDs (diff) | |
| parent | x86/entry: Unbreak __irqentry_text_start/end magic (diff) | |
| download | linux-rng-f77d26a9fc525286bcef3d4f98b52e17482cf49c.tar.xz linux-rng-f77d26a9fc525286bcef3d4f98b52e17482cf49c.zip | |
Merge branch 'x86/entry' into ras/core
to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.
Diffstat (limited to 'net/lapb')
| -rw-r--r-- | net/lapb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/lapb/Kconfig b/net/lapb/Kconfig index 6acfc999c952..5b50e8d64f26 100644 --- a/net/lapb/Kconfig +++ b/net/lapb/Kconfig @@ -15,7 +15,7 @@ config LAPB currently supports LAPB only over Ethernet connections. If you want to use LAPB connections over Ethernet, say Y here and to "LAPB over Ethernet driver" below. Read - <file:Documentation/networking/lapb-module.txt> for technical + <file:Documentation/networking/lapb-module.rst> for technical details. To compile this driver as a module, choose M here: the |