| commit | dd8240bd3e59c5f4d49195a711cb4f12aeb7cf85 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 17 17:51:52 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 17 17:51:52 2011 -0800 |
| tree | 615ec7accc4be99beea1bb01f69667e66dbcc79e | |
| parent | a0aeccdc694d5db3b4310a6ed1ce4f88974cf7b4 [diff] | |
| parent | 814b0a61204d24f9fba6f7c575e6450d15ce2cf1 [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/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