aboutsummaryrefslogtreecommitdiff
path: root/fs/lockd/clntlock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-30 17:45:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-30 17:45:28 -0800
commit6094c85a935f7eadb4c607c6dc6d86c0a9f09a4b (patch)
tree64798f350779f041812cb0265993907f972b5efa /fs/lockd/clntlock.c
parent590cf28580c999c8ba70dc39b40bab09d69e2630 (diff)
parentee48c3d7d3afab7b582051ee8f3f8979e6a87766 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mlx4: Fix reading SL field out of cqe->sl_vid RDMA/addr: Fix build breakage when IPv6 is disabled
Diffstat (limited to 'fs/lockd/clntlock.c')
0 files changed, 0 insertions, 0 deletions