diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 12:05:17 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 12:05:17 -0400 |
| commit | 415d2b3392d7a80903e0f97f051201aa02bf20e9 (patch) | |
| tree | 47492d2386a0e7f00ef645313cb44ae4960b7e7e /include/linux/assoc_array.h | |
| parent | 4f65245f2d178b9cba48350620d76faa4a098841 (diff) | |
| parent | b8e759b8f6dab1c473c30ac12709095d0b81078e (diff) | |
Merge branch 'for-4.19/cougar' into for-linus
New device support for hid-cougar
Diffstat (limited to 'include/linux/assoc_array.h')
| -rw-r--r-- | include/linux/assoc_array.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/assoc_array.h b/include/linux/assoc_array.h index a89df3be1686..65e3832f96b2 100644 --- a/include/linux/assoc_array.h +++ b/include/linux/assoc_array.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Generic associative array implementation. | 1 | /* Generic associative array implementation. |
| 2 | * | 2 | * |
| 3 | * See Documentation/assoc_array.txt for information. | 3 | * See Documentation/core-api/assoc_array.rst for information. |
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved. | 5 | * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved. |
| 6 | * Written by David Howells (dhowells@redhat.com) | 6 | * Written by David Howells (dhowells@redhat.com) |