diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/nfsd/cache.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/nfsd/cache.h')
| -rw-r--r-- | include/linux/nfsd/cache.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h index 5bccaab81056..3a3f58934f5e 100644 --- a/include/linux/nfsd/cache.h +++ b/include/linux/nfsd/cache.h | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | #include <linux/uio.h> | 14 | #include <linux/uio.h> |
| 15 | 15 | ||
| 16 | /* | 16 | /* |
| 17 | * Representation of a reply cache entry. The first two members *must* | 17 | * Representation of a reply cache entry. |
| 18 | * be hash_next and hash_prev. | ||
| 19 | */ | 18 | */ |
| 20 | struct svc_cacherep { | 19 | struct svc_cacherep { |
| 21 | struct hlist_node c_hash; | 20 | struct hlist_node c_hash; |