diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 17:45:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 17:45:28 -0800 |
| commit | 6094c85a935f7eadb4c607c6dc6d86c0a9f09a4b (patch) | |
| tree | 64798f350779f041812cb0265993907f972b5efa /security/commoncap.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | Merge branches 'cma' and 'mlx4' into for-linus (diff) | |
| download | linux-dev-6094c85a935f7eadb4c607c6dc6d86c0a9f09a4b.tar.xz linux-dev-6094c85a935f7eadb4c607c6dc6d86c0a9f09a4b.zip | |
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 'security/commoncap.c')
0 files changed, 0 insertions, 0 deletions