]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0aeccd 814b0a6)
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)
commitdd8240bd3e59c5f4d49195a711cb4f12aeb7cf85
tree615ec7accc4be99beea1bb01f69667e66dbcc79etree
parenta0aeccdc694d5db3b4310a6ed1ce4f88974cf7b4commit | diff
parent814b0a61204d24f9fba6f7c575e6450d15ce2cf1commit | 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
Ubuntu Disco kernel mirror for Proxmox VE and PMG