diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 23:40:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 23:40:37 -0400 |
commit | 6db602d447fb6c3aeb020c5dff5219de317f8bb4 (patch) | |
tree | 379cfdff0c1f6eb66edfbc6a50dfde281602ca13 /include/linux/telephony.h | |
parent | e89a5a43b95cdc4305b7c8e8121a380f02476636 (diff) | |
parent | 5ff70cac3e98af64f9a1eaec9e762ff4927c26d1 (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/ehca: SRQ fixes to enable IPoIB CM
IB/ehca: Fix Small QP regressions
Diffstat (limited to 'include/linux/telephony.h')
0 files changed, 0 insertions, 0 deletions