]> 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: 256a13d 27676a3)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:33:30 +0000 (11:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:33:30 +0000 (11:33 -0700)
commit06a1578e2448112d6f635b1a458a65e36f0f97c6
treede48f52efe3af42efa602274db1b501749ec260etree
parent256a13dd708004082a2de0938fd614b155c259e2commit | diff
parent27676a3e166b352928a8ef7b1c0e322f3c471a3ecommit | 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/ipath: Fix SM trap forwarding
  IB/ehca: Reject send WRs only for RESET, INIT and RTR state
  MAINTAINERS: Update NetEffect (iw_nes) entry
  IB/ipath: Fix device capability flags
  IB/ipath: Avoid test_bit() on u64 SDMA status value
MAINTAINERS diff1 | diff2 | blob | history
Ubuntu Disco kernel mirror for Proxmox VE and PMG