diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2017-03-24 16:22:07 +0300 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2017-04-03 16:08:58 +0300 |
| commit | c369898759e0e143a513d022121290370f001d01 (patch) | |
| tree | 5c770207fcec81a9fac2380821a7fad02cdd32e2 /Documentation/watchdog | |
| parent | cc963a11b67b796c25c5b827b25d2bcc92ce1779 (diff) | |
| parent | f9fe1c12d126f9887441fa5bb165046f30ddd4b5 (diff) | |
| download | linux-c369898759e0e143a513d022121290370f001d01.tar.xz | |
Merge commit 'f9fe1c1' into for-next
Andreas Gruenbacher added function rhashtable_lookup_get_insert_fast
to rhashtable.h. That patch went into the net-next tree. In a
subsequent patch, GFS2 makes use of this new function. Therefore, we
needed a merge commit to make the new function available to GFS2.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'Documentation/watchdog')
0 files changed, 0 insertions, 0 deletions