diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-15 15:11:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-15 15:11:56 -0700 |
| commit | bbf625990371782370f6eacb3155dc1fe131ddfc (patch) | |
| tree | bcfedc2336284948c1aedc572fcd7ff80bb4262c /arch/xtensa | |
| parent | bf36c6b946c8895cf590f10dbd70b589b0dc101f (diff) | |
| parent | 2a9b29b289833e42e13fdfb7e082499c1464f25c (diff) | |
| download | linux-stable-bbf625990371782370f6eacb3155dc1fe131ddfc.tar.gz linux-stable-bbf625990371782370f6eacb3155dc1fe131ddfc.tar.bz2 linux-stable-bbf625990371782370f6eacb3155dc1fe131ddfc.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina:
"The latest advances in computer science from the trivial queue"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
xtensa: fix Kconfig typo
spelling.txt: Remove some duplicate entries
mtd: rawnand: oxnas: cleanup/simplify code
selftests: vm: add fragment CONFIG_GUP_BENCHMARK
perf: Fix opt help text for --no-bpf-event
HID: logitech-dj: Fix spelling in comment
bootconfig: Fix kernel message mentioning CONFIG_BOOT_CONFIG
MAINTAINERS: rectify MMP SUPPORT after moving cputype.h
scif: Fix spelling of EACCES
printk: fix global comment
lib/bitmap.c: fix spello
fs: Fix missing 'bit' in comment
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index d8a29dc5a284..b73d775831f1 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -523,7 +523,7 @@ config MEMMAP_CACHEATTR 2: cache bypass, 4: WB cached, f: illegal. - For ful MMU: + For full MMU: bit 0: executable, bit 1: writable, bits 2..3: |