diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 22:55:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 22:55:33 (GMT) |
| commit | 0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2 (patch) | |
| tree | 61dbcee09d925a839b34df3b8149e26972dc5402 /kernel/timer.c | |
| parent | 2442d3109943bafbdfc4f0495e3d10eeedc8390c (diff) | |
| parent | b45bfcc1ae084aa98c0350b8c33c8b57540b0acc (diff) | |
| download | linux-0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2.tar.xz | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Remove obsolete prototypes
IB/ehca: Remove use of do_mmap()
RDMA/addr: Handle ethernet neighbour updates during route resolution
IB: Make sure struct ib_user_mad.data is aligned
IB/srp: Don't wait for response when QP is in error state.
IB: Return qp pointer as part of ib_wc
IB: Include <linux/kref.h> explicitly in <rdma/ib_verbs.h>
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions