]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 01:51:52 +0000 (17:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 01:51:52 +0000 (17:51 -0800)
commit00a069b683e6e135f425f45fde12bc93c2039cbf
tree615ec7accc4be99beea1bb01f69667e66dbcc79e
parent6ac720f851d5fc6f5ecdd9e9698f50e1846d9f59
parentf9e02bccf383f113ce14dc4e4854613435150e62
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