diff options
| author | Linus Torvalds <[email protected]> | 2011-02-18 01:51:52 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-02-18 01:51:52 +0000 |
| commit | dd8240bd3e59c5f4d49195a711cb4f12aeb7cf85 (patch) | |
| tree | 615ec7accc4be99beea1bb01f69667e66dbcc79e /net/unix/af_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | Merge branches 'nes' and 'qib' into for-next (diff) | |
| download | kernel-dd8240bd3e59c5f4d49195a711cb4f12aeb7cf85.tar.gz kernel-dd8240bd3e59c5f4d49195a711cb4f12aeb7cf85.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/qib: Prevent double completions after a timeout or RNR error
IB/qib: Fix double add_timer()
RDMA/nes: Don't generate async events for unregistered devices
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions