summaryrefslogtreecommitdiff
path: root/Documentation/keys.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-31 20:43:41 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-31 20:43:41 +0400
commit85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch)
tree7bb15ada5f536950efa23ad60ea9eea60380ca1c /Documentation/keys.txt
parenta300bec952127d9a15e666b391bb35c9aecb3002 (diff)
parent6e86841d05f371b5b9b86ce76c02aaee83352298 (diff)
downloadlinux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.xz
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'Documentation/keys.txt')
-rw-r--r--Documentation/keys.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/keys.txt b/Documentation/keys.txt
index d5c7a57d1700..b56aacc1fff8 100644
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
@@ -864,7 +864,7 @@ payload contents" for more information.
request_key_with_auxdata() respectively.
These two functions return with the key potentially still under
- construction. To wait for contruction completion, the following should be
+ construction. To wait for construction completion, the following should be
called:
int wait_for_key_construction(struct key *key, bool intr);