]> 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, 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)
commitd67c8fb2ced6610d99803196ce5c1eb9f3dc3e85
treede48f52efe3af42efa602274db1b501749ec260e
parent8dad4f4cdc96fd01e778033d41d36324288fe276
parentd43041cec4cd71e0871075042b2549bced264609
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