aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/nvmem
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-09-04 11:01:18 +0200
committerIngo Molnar <mingo@kernel.org>2017-09-04 11:01:18 +0200
commitedc2988c548db05e33b921fed15821010bc74895 (patch)
treeb35860428acea35e5866d4cf007519ed943a85de /Documentation/nvmem
parentlocking/lockdep/selftests: Fix mixed read-write ABBA tests (diff)
parentMerge branch 'docs-next' of git://git.lwn.net/linux (diff)
downloadlinux-dev-edc2988c548db05e33b921fed15821010bc74895.tar.xz
linux-dev-edc2988c548db05e33b921fed15821010bc74895.zip
Merge branch 'linus' into locking/core, to fix up conflicts
Conflicts: mm/page_alloc.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/nvmem')
-rw-r--r--Documentation/nvmem/nvmem.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/nvmem/nvmem.txt b/Documentation/nvmem/nvmem.txt
index dbd40d879239..8d8d8f58f96f 100644
--- a/Documentation/nvmem/nvmem.txt
+++ b/Documentation/nvmem/nvmem.txt
@@ -112,7 +112,7 @@ take nvmem_device as parameter.
5. Releasing a reference to the NVMEM
=====================================
-When a consumers no longer needs the NVMEM, it has to release the reference
+When a consumer no longer needs the NVMEM, it has to release the reference
to the NVMEM it has obtained using the APIs mentioned in the above section.
The NVMEM framework provides 2 APIs to release a reference to the NVMEM.